diff options
| -rw-r--r-- | mkspecs/macx-xcode/default.xcscheme | 10 | ||||
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mkspecs/macx-xcode/default.xcscheme b/mkspecs/macx-xcode/default.xcscheme index bda2b8c1c0..bd2cb0e565 100644 --- a/mkspecs/macx-xcode/default.xcscheme +++ b/mkspecs/macx-xcode/default.xcscheme @@ -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> diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 7ffe580c22..57a1bff3a0 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -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; |