Do not pass linking information from qmake to gyp and to qmake again

Instead make sure that the QT and QT_PRIVATE variables are identical
in both core_gyp_generator.pro and core_module.pro, the former for
compilation and the later for linking.

This allows working around issues of qmake when handling -l switches
in libs. Some features on Windows append version numbers, while this
is not done when linking to Qt libraries via the QT variable.

Change-Id: I04b58a313335daeffc9510471553517c63908852
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 0 insertions, 33 deletions

diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index e19c9568c..4e1b6f5bb 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -71,17 +71,6 @@ for (incl, GYPINCLUDES): GYP_CONTENTS += "      '$$incl',"
 GYP_CONTENTS += "    ],"
 }
 
-# Split LIBS into linker flags and actual libraries, and add them to the
-# appropriate section (ldflags vs link_settings: libraries) in the gyp file.
-LIBRARIES = $$find(LIBS, "-l")
-LIBRARIES = $$unique(LIBRARIES)
-for (library, LIBRARIES): LIBS -= "$$library"
-
-GYP_CONTENTS += "    'ldflags': ["
-for (lib, LIBS): GYP_CONTENTS += "      '$$lib',"
-for (rpath, QMAKE_RPATHDIR): GYP_CONTENTS += "      '$$QMAKE_RPATH$$rpath',"
-GYP_CONTENTS += "    ],"
-
 !isEmpty(QMAKE_FRAMEWORKPATH) {
     GYP_CONTENTS += "    'mac_framework_dirs': ["
     GYP_CONTENTS += "      '$$QMAKE_FRAMEWORKPATH',"
@@ -98,28 +87,6 @@ GYP_CONTENTS += "    ],"
     for(flag, QMAKE_CXXFLAGS): GYP_CONTENTS += "      '$$flag',"
     GYP_CONTENTS += "    ],"
 }
-GYP_CONTENTS += "    'link_settings': {" \
-                "      'libraries': ["
-win32: for (library, LIBRARIES): GYP_CONTENTS += "        '$${library}.lib',"
-else:  for (library, LIBRARIES): GYP_CONTENTS += "        '$$library',"
-macx {
-    FRAMEWORKS = $$find(LIBS, "Q*")
-    FRAMEWORKS = $$unique(FRAMEWORKS)
-    FRAMEWORKS ~= s/-.*/
-    FRAMEWORKS -= "-framework"
-    for (framework, FRAMEWORKS): {
-        framework_name = $$join(framework, "", "", ".framework")
-        GYP_CONTENTS += "        '$$framework_name',"
-    }
-
-    FRAMEWORK_PATHS = $$find(LIBS, "-F*")
-    FRAMEWORK_PATHS = $$unique(FRAMEWORK_PATHS)
-    FRAMEWORK_PATHS -= "-framework"
-    for (framework_path, FRAMEWORK_PATHS): GYP_CONTENTS += "        '$$framework_path',"
-    !isEmpty(QMAKE_FRAMEWORKPATH): GYP_CONTENTS += "        '-F$$QMAKE_FRAMEWORKPATH',"
-}
-GYP_CONTENTS += "      ]," \
-             "    },"
 
 !isEmpty(DEFINES) {
   GYP_CONTENTS += "    'defines': ["