diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-07 13:38:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-07 13:38:48 (GMT) |
| commit | 71f8955e0a2744bccff94495c4db5e054db8ab95 (patch) | |
| tree | 45e278e9add8f4bef667eb386d718d0be5f666bd | |
| parent | ae1e2319bccfc57cc47614ece39e64b80e5f2380 (diff) | |
| parent | 457d1e176a8f298f8d753d40f177b771113329dd (diff) | |
| download | Qt-71f8955e0a2744bccff94495c4db5e054db8ab95.zip Qt-71f8955e0a2744bccff94495c4db5e054db8ab95.tar.gz Qt-71f8955e0a2744bccff94495c4db5e054db8ab95.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add library prefixes for Cygwin
| -rw-r--r-- | mkspecs/cygwin-g++/qmake.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index ddfceb0..c46384f 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf @@ -68,6 +68,9 @@ QMAKE_LIBS_X11SM = -lSM -lICE QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread +QMAKE_PREFIX_SHLIB = lib +QMAKE_PREFIX_STATICLIB = lib +QMAKE_EXTENSION_STATICLIB = a QMAKE_MOC = $$[QT_INSTALL_BINS]/moc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic |