diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-07 15:13:08 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-07 15:14:27 +0200 |
| commit | 7c8980ee041e874a6c430f01b2daff4955517b03 (patch) | |
| tree | aa19249a7fb469176fb22adfa9a1b702ae3be6c0 /qmake | |
| parent | 8031eada2f81963865390b4d899631b09d4ca6f3 (diff) | |
| parent | a05f73499a187c67a394893e2cc74516ccbc46f5 (diff) | |
| download | qt4-tools-7c8980ee041e874a6c430f01b2daff4955517b03.tar.gz | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32-g++ | 2 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 2 | ||||
| -rw-r--r-- | qmake/qmake.pri | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 0707a3ad7f..cba42575b2 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -28,7 +28,7 @@ CFLAGS = -c -o$@ -O \ -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT CXXFLAGS = $(CFLAGS) LFLAGS = -static-libgcc -static-libstdc++ -s -LIBS = -lole32 -luuid +LIBS = -lole32 -luuid -ladvapi32 -lkernel32 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 c3537e39f7..0d3bb68468 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -28,7 +28,7 @@ CFLAGS = -c -o$@ -O \ -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT CXXFLAGS = $(CFLAGS) LFLAGS = -static-libgcc -static-libstdc++ -s -LIBS = -lole32 -luuid +LIBS = -lole32 -luuid -ladvapi32 -lkernel32 LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = diff --git a/qmake/qmake.pri b/qmake/qmake.pri index bc7ddb86ad..d6c5f09107 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -141,7 +141,7 @@ bootstrap { #Qt code SOURCES += qfilesystemengine_win.cpp qfsfileengine_win.cpp qfilesystemiterator_win.cpp qsettings_win.cpp \ qsystemlibrary.cpp win32-msvc*:LIBS += ole32.lib advapi32.lib - win32-g++*:LIBS += -lole32 -luuid + win32-g++*:LIBS += -lole32 -luuid -ladvapi32 -lkernel32 } qnx { |