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/qmake.pri | |
| 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/qmake.pri')
| -rw-r--r-- | qmake/qmake.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index efe4f36..17d9518 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -12,7 +12,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ generators/makefiledeps.cpp generators/metamakefile.cpp generators/mac/pbuilder_pbx.cpp \ generators/xmloutput.cpp generators/win32/borland_bmake.cpp \ generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \ - generators/win32/msvc_dsp.cpp generators/win32/msvc_vcproj.cpp \ + generators/win32/msvc_vcproj.cpp \ generators/win32/msvc_objectmodel.cpp \ generators/symbian/symmake.cpp \ generators/symbian/symmake_abld.cpp \ @@ -24,7 +24,7 @@ HEADERS += project.h property.h generators/makefile.h \ generators/win32/winmakefile.h generators/projectgenerator.h \ generators/makefiledeps.h generators/metamakefile.h generators/mac/pbuilder_pbx.h \ generators/xmloutput.h generators/win32/borland_bmake.h generators/win32/msvc_nmake.h \ - generators/win32/msvc_dsp.h generators/win32/msvc_vcproj.h \ + generators/win32/msvc_vcproj.h \ generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \ generators/symbian/symmake.h \ generators/symbian/symmake_abld.h \ |