diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
| commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
| tree | 598d682291945055e4f6feb08a228212648482c1 /src/tools/bootstrap | |
| parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
| parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/tools/bootstrap')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 9 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 12 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index e34cc5c033..228fcaca0d 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -29,18 +29,13 @@ win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \ - $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore \ - $$QT_BUILD_TREE/include/QtXml \ - $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION \ - $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION/QtXml \ - $$QT_SOURCE_TREE/src/xml + $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore DEPENDPATH += $$INCLUDEPATH \ $$QT_SOURCE_TREE/src/corelib/global \ $$QT_SOURCE_TREE/src/corelib/kernel \ $$QT_SOURCE_TREE/src/corelib/tools \ $$QT_SOURCE_TREE/src/corelib/io \ - $$QT_SOURCE_TREE/src/corelib/codecs \ - $$QT_SOURCE_TREE/src/xml + $$QT_SOURCE_TREE/src/corelib/codecs hpux-acc*|hpuxi-acc* { LIBS += $$QT_BUILD_TREE/src/tools/bootstrap/libbootstrap.a diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 571bae7f24..9c34c758d7 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -32,10 +32,7 @@ win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \ - $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore \ - $$QT_BUILD_TREE/include/QtXml \ - $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION \ - $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION/QtXml \ + $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore DEPENDPATH += $$INCLUDEPATH \ ../../corelib/global \ @@ -43,8 +40,7 @@ DEPENDPATH += $$INCLUDEPATH \ ../../corelib/tools \ ../../corelib/io \ ../../corelib/codecs \ - ../../corelib/json \ - ../../xml + ../../corelib/json SOURCES += \ ../../corelib/codecs/qlatincodec.cpp \ @@ -97,9 +93,7 @@ SOURCES += \ ../../corelib/json/qjsonarray.cpp \ ../../corelib/json/qjsonvalue.cpp \ ../../corelib/json/qjsonparser.cpp \ - ../../corelib/json/qjsonwriter.cpp \ - ../../xml/dom/qdom.cpp \ - ../../xml/sax/qxml.cpp + ../../corelib/json/qjsonwriter.cpp unix:SOURCES += ../../corelib/io/qfilesystemengine_unix.cpp \ ../../corelib/io/qfilesystemiterator_unix.cpp \ |