diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 03:24:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 03:24:03 (GMT) |
| commit | a2e7ab8926c5e8a4c89bb017bbcacfcfbf43ef25 (patch) | |
| tree | eadedfd873d7684bdec5f4d793ddd96a96beb897 /qmake/Makefile.win32-g++-sh | |
| parent | 1cdaca2823a7c09f377ab205e6424e35febcbf2c (diff) | |
| parent | ca89d8dc944e7af886c3b31c9d23c8957e5667ab (diff) | |
| download | Qt-a2e7ab8926c5e8a4c89bb017bbcacfcfbf43ef25.zip Qt-a2e7ab8926c5e8a4c89bb017bbcacfcfbf43ef25.tar.gz Qt-a2e7ab8926c5e8a4c89bb017bbcacfcfbf43ef25.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits)
Doc: Enabled the context menu in the spreadsheet demo.
Updated URLs.
Doc: Applied suggestion for an improvement to the foreach documentation.
Doc: Added a note about the lack of standard file copy/paste on X11.
Doc: Fixed the row number for a widget in two parts of the tutorial.
Doc: Fixed typos.
Reduce compiling time of QScriptValue autotest suite on Windows.
Optimize QScriptValue autotest generator.
Set database write behavior to synchronous=OFF and increase page cache.
doc: Fixed some qdoc errors.
Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text.
Allow building documentation without all of Qt
Added a documentation for the new enum value in gesture api.
Remove the OBJECTS_DIR variable assignment from some projets in Qt.
Fix compile
qmake/MinGw: Link statically for Qt Creator to be able to detect it.
Enable two fast path for blend_tiled_rgb565
Avoid QString reallocation for smallcaps fonts in Itemizer::generate()
Make QLabel::text a reloadable property
remove non wifi interfaces from being handled.
...
Diffstat (limited to 'qmake/Makefile.win32-g++-sh')
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index 5061089..f7b486f 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -27,7 +27,7 @@ CFLAGS = -c -o$@ -O \ -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ -DQT_BOOTSTRAPPED CXXFLAGS = $(CFLAGS) -LFLAGS = +LFLAGS = -static-libgcc -s LIBS = -lole32 -luuid LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = |