diff options
| author | axis <qt-info@nokia.com> | 2010-02-18 14:31:01 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-18 14:31:01 (GMT) |
| commit | d24f440ed547f8e9a3737670e41bb645a9159501 (patch) | |
| tree | 14e9ac83c6d688e5480403a152e3ad2e60566ea8 /qmake/Makefile.win32-g++-sh | |
| parent | b477d02479d9effbdb97e189a60dbf44dda5cbc9 (diff) | |
| parent | 505dc33a4060b6fb2a80f3a3ab2a6702ec0b5f3b (diff) | |
| download | Qt-d24f440ed547f8e9a3737670e41bb645a9159501.zip Qt-d24f440ed547f8e9a3737670e41bb645a9159501.tar.gz Qt-d24f440ed547f8e9a3737670e41bb645a9159501.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/Makefile.unix
qmake/generators/makefile.cpp
Diffstat (limited to 'qmake/Makefile.win32-g++-sh')
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index bce414e..7f33b0f 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -36,7 +36,7 @@ ADDCLEAN = OBJS = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \ option.o winmakefile.o projectgenerator.o property.o meta.o \ makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \ - borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \ + borland_bmake.o msvc_nmake.o msvc_vcproj.o \ msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \ symmake_abld.o symmake_sbsv2.o symbiancommon.o @@ -256,9 +256,6 @@ mingw_make.o: $(SOURCE_PATH)/qmake/generators/win32/mingw_make.cpp msvc_nmake.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_nmake.cpp $(CXX) $(CXXFLAGS) generators/win32/msvc_nmake.cpp -msvc_dsp.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_dsp.cpp - $(CXX) $(CXXFLAGS) generators/win32/msvc_dsp.cpp - msvc_vcproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp $(CXX) $(CXXFLAGS) generators/win32/msvc_vcproj.cpp |