diff options
| -rw-r--r-- | qmake/Makefile.win32 | 2 | ||||
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 44102474b8..bac6e950be 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -61,7 +61,7 @@ OBJS = project.obj main.obj ioutils.obj proitems.obj qmakevfs.obj \ qmakeglobals.obj qmakeparser.obj qmakeevaluator.obj qmakebuiltins.obj \ makefile.obj unixmake.obj unixmake2.obj mingw_make.obj \ option.obj winmakefile.obj projectgenerator.obj property.obj meta.obj \ - makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \ + makefiledeps.obj metamakefile.obj xmloutput.obj \ msvc_nmake.obj msvc_vcproj.obj msvc_vcxproj.obj \ msvc_objectmodel.obj msbuild_objectmodel.obj registry.obj \ gbuild.obj cesdkhandler.obj diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index a037a966f6..ababbb2076 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -444,7 +444,11 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO) } else if(gen == "MINGW") { mkfile = new MingwMakefileGenerator; } else if(gen == "PROJECTBUILDER" || gen == "XCODE") { +#ifdef Q_CC_MSVC + fprintf(stderr, "Generating Xcode projects is not supported with an MSVC build of Qt.\n"); +#else mkfile = new ProjectBuilderMakefileGenerator; +#endif } else if(gen == "MSVC.NET") { if (proj->first("TEMPLATE").startsWith("vc")) mkfile = new VcprojGenerator; |