diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 09:33:49 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 09:34:07 +0200 |
| commit | e15d4c73762ca8b21acebe581c520bcd06a8d867 (patch) | |
| tree | ecf4903db11f3e8a58dadada2ceb38c869f761e3 /src | |
| parent | 7137785c87497f8beb5bda20505466430c6b1521 (diff) | |
| parent | 024b56232908af2083720c96a40666c325336141 (diff) | |
| download | qtxmlpatterns-e15d4c73762ca8b21acebe581c520bcd06a8d867.tar.gz | |
Merge branch 'refactor'
Conflicts:
src/xmlpatterns/xmlpatterns.pro
Change-Id: I8d435220281ec372f23c98ab3c15c9a208bacad8
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmlpatterns/xmlpatterns.pro | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index 1422a0e..c1960c7 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -1,23 +1,20 @@ 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 +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) |