diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-12 11:21:56 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-12 11:22:16 (GMT) |
commit | f62e846c7ebe243a2a36e7577d070f1275f2ec47 (patch) | |
tree | 0cbfa6cd832b6f20ea699e8f172b1b3afe96b2c2 /qmake/Makefile.win32-g++-sh | |
parent | 6a8beac59f5824e1fc826f513495fbb8478b79ce (diff) | |
parent | d2b05885a28aafa331b25cdf3b647b782605df08 (diff) | |
download | Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.zip Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.tar.gz Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.tar.bz2 |
Merge earth-team into origin/master'
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 53103b2..49ccfbc 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 = |