diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 12:34:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 12:34:06 (GMT) |
| commit | 2735bc6759f881c786a1097580a8682e3d28f365 (patch) | |
| tree | d16cbc4e32c4f4a2f5e49083400f9ab85831b09a /src/tools | |
| parent | 234751504f2703d39e562966431a54c015fb990e (diff) | |
| parent | 688deeee6c8c2892becb4207f8c40dddba0e3769 (diff) | |
| download | Qt-2735bc6759f881c786a1097580a8682e3d28f365.zip Qt-2735bc6759f881c786a1097580a8682e3d28f365.tar.gz Qt-2735bc6759f881c786a1097580a8682e3d28f365.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add missing license header
Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
Compile fix WinCE
Ensure that we load system libraries from the correct location.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 0dbb90f..21fd412 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -87,7 +87,8 @@ unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp \ ../../corelib/io/qfsfileengine_iterator_unix.cpp win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp \ - ../../corelib/io/qfsfileengine_iterator_win.cpp + ../../corelib/io/qfsfileengine_iterator_win.cpp \ + ../../corelib/plugin/qsystemlibrary.cpp \ macx: { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported) |