diff options
| author | Jani Uusi-Rantala <jani.uusi-rantala@nokia.com> | 2011-09-05 21:09:59 +0300 |
|---|---|---|
| committer | Jani Uusi-Rantala <jani.uusi-rantala@nokia.com> | 2011-09-06 14:35:13 +0200 |
| commit | 024b56232908af2083720c96a40666c325336141 (patch) | |
| tree | 012fa22a36c800f6304cb859ac1d2793711df12c /src/xmlpatterns | |
| parent | eb545b4ddbf8f6a1f8ab10bf9de2c6a129486869 (diff) | |
| download | qtxmlpatterns-024b56232908af2083720c96a40666c325336141.tar.gz | |
Build fix with latest refactored Qt5
load(qt_module_config) was missing from project file
and including qtbase.pri seemed to be completely wrong.
Change-Id: I6df54292c54988ff2a7168a83b5b79835810b6ed
Reviewed-on: http://codereview.qt.nokia.com/4219
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/xmlpatterns')
| -rw-r--r-- | src/xmlpatterns/xmlpatterns.pro | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index 6ed3033..ccde1c8 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -1,23 +1,22 @@ load(qt_module) -TARGET = QtXmlPatterns -QPRO_PWD = $$PWD -QT = core-private \ - network +TARGET = QtXmlPatterns +QPRO_PWD = $$PWD CONFIG += module -MODULE_PRI = ../../modules/qt_xmlpatterns.pri +MODULE_PRI += ../../modules/qt_xmlpatterns.pri -DEFINES += QT_BUILD_XMLPATTERNS_LIB \ - QT_NO_USING_NAMESPACE +QT = core-private network + +DEFINES += QT_BUILD_XMLPATTERNS_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \ - QtNetwork -include($$QT_SOURCE_TREE/src/qbase.pri) + +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork + +load(qt_module_config) HEADERS += qtxmlpatternsversion.h -PRECOMPILED_HEADER = $$QT_SOURCE_TREE/src/corelib/global/qt_pch.h include($$PWD/common.pri) include($$PWD/acceltree/acceltree.pri) include($$PWD/api/api.pri) |