qmake: Parse -framework link lines the same way the linker does

[ChangeLog][qmake] The syntax 'LIBS += -frameworkFoo', or 'LIBS += "-framework Foo"' is no longer supported. Use the canonical 'LIBS += -framework Foo' instead. Change-Id: I50fd02dbfa155a0b95859734486a92bd448e87c2 Reviewed-by: Edward Welbourne <[email protected]> Reviewed-by: Alexandru Croitor <[email protected]> Reviewed-by: Tor Arne Vestbø <[email protected]>
wx984490083 · Oct 4, 2019 · 3018c48 · 3018c48
1 parent d3be61d
commit 3018c48
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
@@ -433,12 +433,9 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
                     QMakeLocalFileName f(opt.mid(2));
                     if (!frameworkdirs.contains(f))
                         frameworkdirs.insert(fwidx++, f);
-                } else if (target_mode == TARG_MAC_MODE && opt.startsWith("-framework")) {
+                } else if (target_mode == TARG_MAC_MODE && opt == "-framework") {
                     if (linkPrl) {
-                        if (opt.length() == 10)
-                            opt = (*++it).toQString();
-                        else
-                            opt = opt.mid(10).trimmed();
+                        opt = (*++it).toQString();
                         static const QChar suffixMarker = ',';
                         const int suffixPosition = opt.indexOf(suffixMarker);
                         const bool hasSuffix = suffixPosition >= 0;