whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake: Write correct Xcode project directory name to xcscheme file 

The Xcode project name may be affected by e.g. the -o argument to qmake,
so we can't assume it's based on the target.

Change-Id: Ibb9f4265017ffcfe26bd8734758dcb30237c704f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Tor Arne Vestbø 2018-07-17 15:41:06 +02:00
parent 65463857a9
commit 87d5d14d10
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mkspecs/macx-xcode/default.xcscheme
View File

@ -17,7 +17,7 @@
BlueprintIdentifier = "@TARGET_PBX_KEY@"
BuildableName = "@QMAKE_ORIG_TARGET@"
BlueprintName = "@QMAKE_ORIG_TARGET@"
ReferencedContainer = "container:@QMAKE_ORIG_TARGET@.xcodeproj">
ReferencedContainer = "container:@QMAKE_RELATIVE_PBX_DIR@">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@ -35,7 +35,7 @@
BlueprintIdentifier = "@TEST_BUNDLE_PBX_KEY@"
BuildableName = "Qt Test"
BlueprintName = "Qt Test"
ReferencedContainer = "container:@QMAKE_ORIG_TARGET@.xcodeproj">
ReferencedContainer = "container:@QMAKE_RELATIVE_PBX_DIR@">
</BuildableReference>
</TestableReference>
</Testables>
@ -45,7 +45,7 @@
BlueprintIdentifier = "@TARGET_PBX_KEY@"
BuildableName = "@QMAKE_ORIG_TARGET@"
BlueprintName = "@QMAKE_ORIG_TARGET@"
ReferencedContainer = "container:@QMAKE_ORIG_TARGET@.xcodeproj">
ReferencedContainer = "container:@QMAKE_RELATIVE_PBX_DIR@">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
@ -71,7 +71,7 @@
BlueprintIdentifier = "@TARGET_PBX_KEY@"
BuildableName = "@QMAKE_ORIG_TARGET@"
BlueprintName = "@QMAKE_ORIG_TARGET@"
ReferencedContainer = "container:@QMAKE_ORIG_TARGET@.xcodeproj">
ReferencedContainer = "container:@QMAKE_RELATIVE_PBX_DIR@">
</BuildableReference>
</BuildableProductRunnable>
<EnvironmentVariables>
@ -96,7 +96,7 @@
BlueprintIdentifier = "@TARGET_PBX_KEY@"
BuildableName = "@QMAKE_ORIG_TARGET@"
BlueprintName = "@QMAKE_ORIG_TARGET@"
ReferencedContainer = "container:@QMAKE_ORIG_TARGET@.xcodeproj">
ReferencedContainer = "container:@QMAKE_RELATIVE_PBX_DIR@">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>

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

@ -1783,6 +1783,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
schemeData.replace(QLatin1String("@QMAKE_ORIG_TARGET@"), target);
schemeData.replace(QLatin1String("@TARGET_PBX_KEY@"), keyFor(pbx_dir + "QMAKE_PBX_TARGET"));
schemeData.replace(QLatin1String("@TEST_BUNDLE_PBX_KEY@"), keyFor("QMAKE_TEST_BUNDLE_REFERENCE"));
schemeData.replace(QLatin1String("@QMAKE_RELATIVE_PBX_DIR@"), fileFixify(pbx_dir));
QTextStream outputSchemeStream(&outputSchemeFile);
outputSchemeStream << schemeData;