diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-24 18:09:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-24 18:09:46 (GMT) |
| commit | 2463367391803130e9f320cbd129aece5b1b708e (patch) | |
| tree | b2339cfd2760834d1761e16c8d124db9e080ae4a | |
| parent | f6310e6148180d651e95bff482ded47272e38718 (diff) | |
| parent | 4ac87b7042f7b08e8b427e21d74aa8d224b186bc (diff) | |
| download | Qt-2463367391803130e9f320cbd129aece5b1b708e.zip Qt-2463367391803130e9f320cbd129aece5b1b708e.tar.gz Qt-2463367391803130e9f320cbd129aece5b1b708e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qsystemlibrary needs no special treatment
| -rw-r--r-- | qmake/Makefile.win32 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 6fd3939..d40000e 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -158,9 +158,6 @@ distclean:: clean $(OBJS): qmake_pch.obj -qsystemlibrary.obj: $(SOURCE_PATH)\src\corelib\plugin\qsystemlibrary.cpp - $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\plugin\qsystemlibrary.cpp - $(QTOBJS): qmake_pch.obj qmake_pch.obj: |