diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2012-10-02 19:22:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-08 17:14:24 +0200 |
| commit | f71170aa35ad37fdee2def64c72c60806f92d00d (patch) | |
| tree | d66673e0f6a6c0082a71a692d59842a34128d96a /src/tools | |
| parent | e0b5571b5348711bbcc19f58455aa69c41b5fe30 (diff) | |
Tools: add QLibraryInfo to the bootstrapped library.
For future use by qdoc.
Change-Id: Id9079a6fa581ff16810df9a8f2bb94314ee11ca9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 0aa9436d03..b5005991ec 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -22,12 +22,14 @@ DEFINES += \ QT_NO_THREAD \ QT_NO_UNICODETABLES \ QT_NO_USING_NAMESPACE \ - QT_NO_DEPRECATED + QT_NO_DEPRECATED \ + QT_QMAKE_LOCATION=\\\"$$QMAKE_QMAKE\\\" INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \ - $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore + $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore \ + $$QT_BUILD_TREE/src/corelib/global DEPENDPATH += $$INCLUDEPATH \ ../../corelib/global \ @@ -42,6 +44,7 @@ SOURCES += \ ../../corelib/codecs/qtextcodec.cpp \ ../../corelib/codecs/qutfcodec.cpp \ ../../corelib/global/qglobal.cpp \ + ../../corelib/global/qlibraryinfo.cpp \ ../../corelib/global/qlogging.cpp \ ../../corelib/global/qmalloc.cpp \ ../../corelib/global/qnumeric.cpp \ @@ -58,6 +61,7 @@ SOURCES += \ ../../corelib/io/qfsfileengine_iterator.cpp \ ../../corelib/io/qiodevice.cpp \ ../../corelib/io/qfiledevice.cpp \ + ../../corelib/io/qsettings.cpp \ ../../corelib/io/qtemporaryfile.cpp \ ../../corelib/io/qtextstream.cpp \ ../../corelib/kernel/qcoreglobaldata.cpp \ @@ -101,11 +105,13 @@ unix:SOURCES += ../../corelib/io/qfilesystemengine_unix.cpp \ win32:SOURCES += ../../corelib/io/qfilesystemengine_win.cpp \ ../../corelib/io/qfilesystemiterator_win.cpp \ ../../corelib/io/qfsfileengine_win.cpp \ + ../../corelib/io/qsettings_win.cpp \ ../../corelib/plugin/qsystemlibrary.cpp \ macx: { - SOURCES += ../../corelib/io/qfilesystemengine_mac.cpp - SOURCES += ../../corelib/kernel/qcore_mac.cpp + SOURCES += ../../corelib/io/qfilesystemengine_mac.cpp \ + ../../corelib/io/qsettings_mac.cpp \ + ../../corelib/kernel/qcore_mac.cpp LIBS += -framework CoreServices } |