qmake: Don't allow -framework without second argument when merging flags

The linker doesn't support -framworkFoo, so neither should we. The correct
syntax is -framework Foo.

Change-Id: I3f39ffc067871ce058542bf0068274b35f7b51f6
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>

1 files changed, 4 insertions, 8 deletions

diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index b809bb6c19..3b6e87a2b6 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -498,14 +498,10 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
                         // Make sure we keep the dependency order of libraries
                         lflags[arch].removeAll(opt);
                         lflags[arch].append(opt);
-                    } else if (target_mode == TARG_MAC_MODE && opt.startsWith("-framework")) {
-                        if (opt.length() > 10) {
-                            opt = opt.mid(10).trimmed();
-                        } else {
-                            opt = l.at(++lit);
-                            if (opt.startsWith("-Xarch"))
-                                opt = l.at(++lit); // The user has done the right thing and prefixed each part
-                        }
+                    } else if (target_mode == TARG_MAC_MODE && opt == "-framework") {
+                        opt = l.at(++lit);
+                        if (opt.startsWith("-Xarch"))
+                            opt = l.at(++lit); // The user has done the right thing and prefixed each part
                         for(int x = 0; x < lflags[arch].size(); ++x) {
                             if (lflags[arch].at(x) == "-framework" && lflags[arch].at(++x) == opt) {
                                 lflags[arch].remove(x - 1, 2);