diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:48:23 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:48:23 +0200 |
commit | b652bffea7a0a1bf209c21d9b73f509226f031bd (patch) | |
tree | 0770567f64ad51b58f55726ae6eac276a4f71d0e /src/xml/xml.pro | |
parent | a0cf2119a74b7f17d3c417bd7364376dd1e0652d (diff) | |
parent | 00f9ac93c248b019e72757da9c5d8121a5fd1bf5 (diff) |
Merge branch 'buildsystem'
This appears to be fully backwards-compatible with all tested modules,
as far as CI is concerned.
Change-Id: I53f979d06d0a264c5aab1193bab181a38ab837d6
Diffstat (limited to 'src/xml/xml.pro')
-rw-r--r-- | src/xml/xml.pro | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/xml/xml.pro b/src/xml/xml.pro index 2fff0218e4..5f4d844ea5 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -1,21 +1,13 @@ -load(qt_module) +load(qt_build_config) TARGET = QtXml -QPRO_PWD = $$PWD QT = core-private -CONFIG += module -MODULE_PRI = ../modules/qt_xml.pri - -DEFINES += QT_BUILD_XML_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 - load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/xml/qtxmlversion.h - QMAKE_DOCS = $$PWD/doc/qtxml.qdocconf QMAKE_DOCS_INDEX = ../../doc |