diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-06-06 18:14:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-11 16:35:53 +0200 |
| commit | 0c313b3adb73e7b91d01909e7230913102fac9f7 (patch) | |
| tree | 363d10fcba3378f4b6a201cd0a89469856da8083 /qmake/generators/mac/pbuilder_pbx.cpp | |
| parent | fabd791bcca92d39d0476a2b1b4c15a58c386329 (diff) | |
Xcode: Don't set TARGET_BUILD_DIR; that's handled by a copy phase
This reverts an earlier change that tried to fix the relationship between
Qt's concept of output directories with what Xcode expects, but it broke
DESTDIR. The relationship between Qt and Xcode is still a mess, but at
least DESTDIR now works.
Change-Id: I44f056d48c87359a609e0337da266120ba4eb155
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'qmake/generators/mac/pbuilder_pbx.cpp')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index a09e10c55e..9f83d7a898 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1340,7 +1340,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) ProString dir = project->first("DESTDIR"); if (QDir::isRelativePath(dir.toQString())) dir.prepend(qmake_getpwd() + Option::dir_sep); - t << "\t\t\t\t" << writeSettings("TARGET_BUILD_DIR", dir) << ";" << "\n"; + t << "\t\t\t\t" << writeSettings("INSTALL_DIR", dir) << ";" << "\n"; } if (project->first("TEMPLATE") == "lib") |