mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
f601ecfb21
Since keeping `installPhase = ""` to signify "use the default installPhase" will be surprising, this deletes the installPhase and rebuilds qt4 on all platforms. Fixes #30238
12 lines
581 B
Diff
12 lines
581 B
Diff
--- a/qmake/generators/unix/unixmake.cpp
|
|
+++ b/qmake/generators/unix/unixmake.cpp
|
|
@@ -831,7 +831,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
|
|
else if(project->first("TEMPLATE") == "app" && !project->isEmpty("QMAKE_STRIPFLAGS_APP"))
|
|
ret += " " + var("QMAKE_STRIPFLAGS_APP");
|
|
if(bundle)
|
|
- ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
|
|
+ ret += " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
|
|
else
|
|
ret += " \"" + dst_targ + "\"";
|
|
}
|