diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 27399c1a1e..2def71c723 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -2644,7 +2644,7 @@ WINRT_MANIFEST.publisher = MyCompany WINRT_MANIFEST.logo_store = someImage.png WINRT_MANIFEST.capabilities += internetClient - WINRT_MANIFEST.device_capabilities += location + WINRT_MANIFEST.capabilities_device += location \endcode Additionally, an input manifest file can be specified by using WINRT_MANIFEST. diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 9d666509fd..7822107a37 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -802,15 +802,16 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) } //copy the plist while (!project->isActiveConfig("no_plist")) { // 'while' just to be able to 'break' - QString info_plist = fileFixify(project->first("QMAKE_INFO_PLIST").toQString()); - if (info_plist.isEmpty()) - info_plist = specdir() + QDir::separator() + "Info.plist." + project->first("TEMPLATE"); - if (!exists(Option::normalizePath(info_plist))) { + QString info_plist = project->first("QMAKE_INFO_PLIST").toQString(); + if (info_plist.isEmpty()) { + info_plist = escapeFilePath(specdir() + QDir::separator() + "Info.plist." + project->first("TEMPLATE")); + } else if (!exists(Option::normalizePath(info_plist))) { warn_msg(WarnLogic, "Could not resolve Info.plist: '%s'. Check if QMAKE_INFO_PLIST points to a valid file.", info_plist.toLatin1().constData()); break; + } else { + info_plist = escapeFilePath(fileFixify(info_plist)); } - info_plist = escapeFilePath(info_plist); bool isApp = (project->first("TEMPLATE") == "app"); QString info_plist_out = bundle_dir + (isApp ? "Contents/Info.plist" |