diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-16 17:19:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-16 17:19:46 (GMT) |
| commit | da2a86555ba79fa67cf98c5985ff64cfdb6b57c7 (patch) | |
| tree | 2fe40042e128329c8ad91f18bb1ec70b37da46dc /qmake/Makefile.unix | |
| parent | 9d174f13e48730ac06aa429e0f011a02b333025e (diff) | |
| parent | 42dda19d82ceea48f19d356cfaf2b26acb763df8 (diff) | |
| download | Qt-da2a86555ba79fa67cf98c5985ff64cfdb6b57c7.zip Qt-da2a86555ba79fa67cf98c5985ff64cfdb6b57c7.tar.gz Qt-da2a86555ba79fa67cf98c5985ff64cfdb6b57c7.tar.bz2 | |
Merge remote branch 'qt/master' into s60-master
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'qmake/Makefile.unix')
| -rw-r--r-- | qmake/Makefile.unix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index fcf43c8..5e3190d 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -9,7 +9,7 @@ LFLAGS = @QMAKE_LFLAGS@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ mingw_make.o option.o winmakefile.o projectgenerator.o \ meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \ - borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o \ + borland_bmake.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o \ symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o #qt code @@ -266,9 +266,6 @@ msvc_nmake.o: generators/win32/msvc_nmake.cpp pbuilder_pbx.o: generators/mac/pbuilder_pbx.cpp $(CXX) -c -o $@ $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp -msvc_dsp.o: generators/win32/msvc_dsp.cpp - $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_dsp.cpp - symmake.o: generators/symbian/symmake.cpp $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake.cpp |