diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-08-09 15:21:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-12 19:01:38 +0200 |
| commit | 684028a64075030b42ce5f3d78d5cb35b936d5b1 (patch) | |
| tree | ba53d821a13ccd59ea04f714a9dbb5cc5de1b6d3 /src/tools | |
| parent | f6a067e0bad24bc7cd8d191f70e77eb92669bc1e (diff) | |
don't put QLibraryInfo and QSettings into bootstrap lib
it's not necessary. it was an artifact of a misguided approach to making
qdoc aware of the qt installation dirs.
Change-Id: I5ff363c8400d17698bf715e70b904aa69f71f0d8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index bf19828634..697c8f5574 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -50,14 +50,11 @@ QMAKE_SYNCQT_OPTIONS += -version $$QT_VERSION load(qt_module) -INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global - SOURCES += \ ../../corelib/codecs/qlatincodec.cpp \ ../../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 \ @@ -74,7 +71,6 @@ 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/io/qstandardpaths.cpp \ @@ -124,13 +120,11 @@ 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/kernel/qcoreapplication_win.cpp \ ../../corelib/plugin/qsystemlibrary.cpp \ mac { - SOURCES += ../../corelib/io/qsettings_mac.cpp \ - ../../corelib/kernel/qcoreapplication_mac.cpp \ + SOURCES += ../../corelib/kernel/qcoreapplication_mac.cpp \ ../../corelib/kernel/qcore_mac.cpp LIBS += -framework CoreServices } |