diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-03-04 10:47:36 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-03-04 10:47:36 (GMT) |
| commit | 52da988db3a03bce5513bc5e2efa3d69f3664f24 (patch) | |
| tree | 40af0546f9c19b2ca566339dc0b236f3fc134e46 /qmake | |
| parent | 7d7a85fa16b28fdba257bb466be5a6d2b4bf5d2f (diff) | |
| download | Qt-52da988db3a03bce5513bc5e2efa3d69f3664f24.zip Qt-52da988db3a03bce5513bc5e2efa3d69f3664f24.tar.gz Qt-52da988db3a03bce5513bc5e2efa3d69f3664f24.tar.bz2 | |
qmake/MinGw: Link statically for Qt Creator to be able to detect it.
Qt Creator detects Qt versions by running qmake. This fails if no
MinGw setup is in the path as is usually the case when starting it
from the menu. Make it possible to run qmake without setup. Strip
executable.
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
Reviewed-by: mariusSO <qt-info@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32-g++ | 2 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index d4d6e0e..27ae27b 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -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 = 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 = |