1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1617809473

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-07 20:33:35 +00:00
commit 8d16237cfa
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mkspecs/features/resources_functions.prf
View File

@ -35,12 +35,10 @@ defineTest(qtFlattenResources) {
} }
RESOURCES -= $$resource RESOURCES -= $$resource
!android { isEmpty(BUILDS)|build_pass {
isEmpty(BUILDS)|build_pass { resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD)
resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) RESOURCES += $$resource_file
RESOURCES += $$resource_file } else: android {
}
} else {
# Android will need a resource file for each architecture make sure it is placed # Android will need a resource file for each architecture make sure it is placed
# correctly for other functions that need the right paths for these files # correctly for other functions that need the right paths for these files
for (arch, ANDROID_ABIS) { for (arch, ANDROID_ABIS) {

8
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -783,6 +783,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
{ {
QString mkfile = pbx_dir + Option::dir_sep + "qt_preprocess.mak"; QString mkfile = pbx_dir + Option::dir_sep + "qt_preprocess.mak";
QFile mkf(mkfile); QFile mkf(mkfile);
ProStringList outputPaths;
if(mkf.open(QIODevice::WriteOnly | QIODevice::Text)) { if(mkf.open(QIODevice::WriteOnly | QIODevice::Text)) {
writingUnixMakefileGenerator = true; writingUnixMakefileGenerator = true;
debug_msg(1, "pbuilder: Creating file: %s", mkfile.toLatin1().constData()); debug_msg(1, "pbuilder: Creating file: %s", mkfile.toLatin1().constData());
@ -832,8 +833,10 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
++added; ++added;
const QString file_name = fileFixify(fn, FileFixifyFromOutdir); const QString file_name = fileFixify(fn, FileFixifyFromOutdir);
const QString tmpOut = fileFixify(tmp_out.first().toQString(), FileFixifyFromOutdir); const QString tmpOut = fileFixify(tmp_out.first().toQString(), FileFixifyFromOutdir);
mkt << ' ' << escapeDependencyPath(Option::fixPathToTargetOS( QString path = escapeDependencyPath(Option::fixPathToTargetOS(
replaceExtraCompilerVariables(tmpOut, file_name, QString(), NoShell))); replaceExtraCompilerVariables(tmpOut, file_name, QString(), NoShell)));
mkt << ' ' << path;
outputPaths << path;
} }
} }
} }
@ -844,6 +847,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
mkt.flush(); mkt.flush();
mkf.close(); mkf.close();
} }
// Remove duplicates from build steps with "combine"
outputPaths.removeDuplicates();
mkfile = fileFixify(mkfile); mkfile = fileFixify(mkfile);
QString phase_key = keyFor("QMAKE_PBX_PREPROCESS_TARGET"); QString phase_key = keyFor("QMAKE_PBX_PREPROCESS_TARGET");
// project->values("QMAKE_PBX_BUILDPHASES").append(phase_key); // project->values("QMAKE_PBX_BUILDPHASES").append(phase_key);
@ -854,6 +859,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
<< "\t\t\t" << writeSettings("isa", "PBXShellScriptBuildPhase", SettingsNoQuote) << ";\n" << "\t\t\t" << writeSettings("isa", "PBXShellScriptBuildPhase", SettingsNoQuote) << ";\n"
<< "\t\t\t" << writeSettings("runOnlyForDeploymentPostprocessing", "0", SettingsNoQuote) << ";\n" << "\t\t\t" << writeSettings("runOnlyForDeploymentPostprocessing", "0", SettingsNoQuote) << ";\n"
<< "\t\t\t" << writeSettings("name", "Qt Preprocessors") << ";\n" << "\t\t\t" << writeSettings("name", "Qt Preprocessors") << ";\n"
<< "\t\t\t" << writeSettings("outputPaths", outputPaths, SettingsAsList, 4) << ";\n"
<< "\t\t\t" << writeSettings("shellPath", "/bin/sh") << ";\n" << "\t\t\t" << writeSettings("shellPath", "/bin/sh") << ";\n"
<< "\t\t\t" << writeSettings("shellScript", "make -C " + IoUtils::shellQuoteUnix(Option::output_dir) << "\t\t\t" << writeSettings("shellScript", "make -C " + IoUtils::shellQuoteUnix(Option::output_dir)
+ " -f " + IoUtils::shellQuoteUnix(mkfile)) << ";\n" + " -f " + IoUtils::shellQuoteUnix(mkfile)) << ";\n"