diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
| commit | e4dc3567af533df2e57425952c4609726515d2cd (patch) | |
| tree | 72824b5efc9a4d6ed9f099d34404076245e164fa /qmake/qmake.pri | |
| parent | a36e8ca7afd0c15e5ec73bf4ea21464ab89a3662 (diff) | |
| parent | dbfedcb31961579499fcb5342ccc42311191bcd4 (diff) | |
| download | Qt-e4dc3567af533df2e57425952c4609726515d2cd.zip Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.gz Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.bz2 | |
Merge remote branch 'origin/master'
Conflicts:
src/gui/dialogs/qnspanelproxy_mac.mm
Diffstat (limited to 'qmake/qmake.pri')
| -rw-r--r-- | qmake/qmake.pri | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 0163839..6e0f8a2 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -13,7 +13,8 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ generators/xmloutput.cpp generators/win32/borland_bmake.cpp \ generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \ generators/win32/msvc_vcproj.cpp \ - generators/win32/msvc_objectmodel.cpp \ + generators/win32/msvc_vcxproj.cpp \ + generators/win32/msvc_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp \ generators/symbian/symbiancommon.cpp \ generators/symbian/symmake.cpp \ generators/symbian/symmake_abld.cpp \ @@ -24,11 +25,12 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ HEADERS += project.h property.h generators/makefile.h \ generators/unix/unixmake.h meta.h option.h cachekeys.h \ - generators/win32/winmakefile.h generators/projectgenerator.h \ + generators/win32/winmakefile.h generators/win32/mingw_make.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_vcproj.h \ - generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \ + generators/win32/msvc_vcxproj.h \ + generators/win32/msvc_objectmodel.h generators/win32/msbuild_objectmodel.h \ generators/symbian/symbiancommon.h \ generators/symbian/symmake.h \ generators/symbian/symmake_abld.h \ |