diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index bf88d0e4bd7423f41ee1e4d82e63378617b0f02e..1a0623161d7dbdb0ebeb764ad78e8824abfe0d53 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -1,18 +1,13 @@ -load(qt_module) +load(qt_build_config) TARGET = QtXmlPatterns -QPRO_PWD = $$PWD - -CONFIG += module exceptions - +CONFIG += exceptions QT = core-private network -DEFINES += QT_BUILD_XMLPATTERNS_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork -load(qt_module_config) -HEADERS += qtxmlpatternsversion.h +load(qt_module_config) include($$PWD/common.pri) include($$PWD/acceltree/acceltree.pri) diff --git a/sync.profile b/sync.profile index a5ce4fa19a9bbe4d64b105834cd4267294e3063e..5242dedb25a53fe1ac9888eed2058c0f1aba6177 100644 --- a/sync.profile +++ b/sync.profile @@ -3,13 +3,6 @@ ); %moduleheaders = ( # restrict the module headers to those found in relative path ); -%classnames = ( - "qtxmlpatternsversion.h" => "QtXmlPatternsVersion", -); -%mastercontent = ( - "core" => "#include <QtCore/QtCore>\n", - "network" => "#include <QtNetwork/QtNetwork>\n", -); # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: diff --git a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro index df0853b4db98bf3e1955ba1ce44f630a04ed5ba0..19f738fb046c9da895e8dc3ed380be7c1dddd8d0 100644 --- a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro +++ b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro @@ -1,7 +1,7 @@ TARGET = tst_xmlpatternsschema CONFIG += testcase QT += testlib -load(qt_module) +load(qt_build_config) SOURCES += tst_xmlpatternsschema.cpp \ diff --git a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro index e2c84b27631181208c63afe26b0633f4c6886e38..4ede97aaf9ca732fe985251bde019401ea63e780 100644 --- a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro +++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) include (../xmlpatterns.pri)