diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:44:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 14:21:22 +0200 |
| commit | b5552bab40f2e165cf7196993ffc83785f4d8264 (patch) | |
| tree | 5ca863fc90caacebd7bd5ebd2464d4b18efdd0dc /qmake | |
| parent | 9cfdd66b6452704349b5f986f31b7f1f03748cb5 (diff) | |
| parent | 01ce104a3ee3c8af68f6694840931661666984ab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Manually changed enum to LibGL in
src/plugins/platforms/xcb/qglxintegration.cpp
Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 | ||||
| -rw-r--r-- | qmake/library/qmakebuiltins.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index da64c33cf2..d44c2ca73f 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1116,7 +1116,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) //all files const ProStringList &files = project->values(ProKey(bundle_data[i] + ".files")); for(int file = 0; file < files.count(); file++) { - QString fn = files[file].toQString(); + QString fn = fileFixify(files[file].toQString(), Option::output_dir, input_dir); QString file_ref_key = keyFor("QMAKE_PBX_BUNDLE_DATA_FILE_REF." + bundle_data[i] + "-" + fn); bundle_file_refs += file_ref_key; t << "\t\t" << file_ref_key << " = {\n" diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp index 7896688e54..46934c83e9 100644 --- a/qmake/library/qmakebuiltins.cpp +++ b/qmake/library/qmakebuiltins.cpp @@ -1745,14 +1745,14 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( if (target == TargetSuper) { if (m_superfile.isEmpty()) { m_superfile = QDir::cleanPath(m_outputDir + QLatin1String("/.qmake.super")); - printf("Info: creating super cache file %s\n", qPrintable(m_superfile)); + printf("Info: creating super cache file %s\n", qPrintable(QDir::toNativeSeparators(m_superfile))); valuesRef(ProKey("_QMAKE_SUPER_CACHE_")) << ProString(m_superfile); } fn = m_superfile; } else if (target == TargetCache) { if (m_cachefile.isEmpty()) { m_cachefile = QDir::cleanPath(m_outputDir + QLatin1String("/.qmake.cache")); - printf("Info: creating cache file %s\n", qPrintable(m_cachefile)); + printf("Info: creating cache file %s\n", qPrintable(QDir::toNativeSeparators(m_cachefile))); valuesRef(ProKey("_QMAKE_CACHE_")) << ProString(m_cachefile); // We could update m_{source,build}Root and m_featureRoots here, or even // "re-home" our rootEnv, but this doesn't sound too useful - if somebody @@ -1766,7 +1766,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( if (fn.isEmpty()) fn = QDir::cleanPath(m_outputDir + QLatin1String("/.qmake.stash")); if (!m_vfs->exists(fn)) { - printf("Info: creating stash file %s\n", qPrintable(fn)); + printf("Info: creating stash file %s\n", qPrintable(QDir::toNativeSeparators(fn))); valuesRef(ProKey("_QMAKE_STASH_")) << ProString(fn); } } |