diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2010-12-02 13:13:07 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2010-12-02 13:13:07 +0100 |
| commit | 655bae506d4d2743ed016c78a767afa2150057a9 (patch) | |
| tree | 9ccc2b4a56792616a2c48045faa9bd7081126167 /qmake/Makefile.win32-g++-sh | |
| parent | 16252a59afa58b0cb4b0ffb02a330dcf002c9750 (diff) | |
| parent | f6f8ba94d5f82b8df723a217a3d0ecb50e570cbc (diff) | |
Merge remote branch 'origin/master' into file-engine-refactor
master's version of conflicting def files picked.
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
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 aad4a9e42d..a84b3f6f16 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -25,7 +25,7 @@ CFLAGS = -c -o$@ -O \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \ -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \ -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ - -DQT_BOOTSTRAPPED + -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT CXXFLAGS = $(CFLAGS) LFLAGS = -static-libgcc -static-libstdc++ -s LIBS = -lole32 -luuid |