diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-07-07 13:38:15 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-13 19:51:17 +0000 |
| commit | 6f1ad48a9115ff415b0496927451d0f7f5ea284c (patch) | |
| tree | 18158e85a9b2649a65ce3bc2aefe689e70fae26a | |
| parent | 1f3eab5536920dd8b2e333589c3675db009f0221 (diff) | |
Remove -fw and -l command line arguments
These arguments were nonsensical, as they would lead to every single Qt
module linking to those libraries. This was probably some left-over from
old times, when Qt was just a single library.
Change-Id: I0343a6df270fd0d2efa5333ba4e457670f5d0910
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | config_help.txt | 2 | ||||
| -rw-r--r-- | configure.json | 2 | ||||
| -rw-r--r-- | configure.pri | 5 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
4 files changed, 1 insertions, 14 deletions
diff --git a/config_help.txt b/config_help.txt index d9cec53a46..b13dbe3c27 100644 --- a/config_help.txt +++ b/config_help.txt @@ -240,7 +240,6 @@ Additional options: -R <string> .......... Add an explicit runtime library path to the Qt libraries. - -l <string> .......... Add an explicit library. -no-rpath ............ Do not use the library install path as a runtime library path. On Apple platforms, this implies using @@ -387,7 +386,6 @@ QNX options: Apple platform options: -Fstring ............ Add an explicit framework path. - -fw string .......... Add an explicit framework. * -framework .......... Build Qt as a series of frameworks and link tools against those frameworks. diff --git a/configure.json b/configure.json index 1bd7364cb7..432670806e 100644 --- a/configure.json +++ b/configure.json @@ -187,10 +187,8 @@ "prefix": { "D": "defines", "F": "fpaths", - "fw": "frameworks", "I": "includes", "L": "lpaths", - "l": "libs", "R": "rpaths", "W": "wflags" } diff --git a/configure.pri b/configure.pri index 1ff9003429..76438f2c20 100644 --- a/configure.pri +++ b/configure.pri @@ -585,12 +585,9 @@ defineTest(qtConfOutput_compilerFlags) { } libs = $$join(config.input.lpaths, " -L", "-L") - libs += $$join(config.input.libs, " -l", "-l") - darwin { + darwin: \ libs += $$join(config.input.fpaths, " -F", "-F") - libs += $$join(config.input.frameworks, " -framework ", "-framework ") - } !isEmpty(libs) { EXTRA_LIBS += $$libs diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 740d8a6edb..3adf54cb04 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -904,11 +904,6 @@ void Configure::parseCmdLine() break; } qmakeLibs += QString("-L" + configCmdLine.at(i)); - } else if (configCmdLine.at(i) == "-l") { - ++i; - if (i == argCount) - break; - qmakeLibs += QString("-l" + configCmdLine.at(i)); } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS=")) { opensslLibs = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS_DEBUG=")) { @@ -1737,7 +1732,6 @@ bool Configure::displayHelp() desc( "-D <define>", "Add an explicit define to the preprocessor."); desc( "-I <includepath>", "Add an explicit include path."); desc( "-L <librarypath>", "Add an explicit library path."); - desc( "-l <libraryname>", "Add an explicit library name, residing in a librarypath.\n"); desc("PCH", "no", "-no-pch", "Do not use precompiled header support."); desc("PCH", "yes", "-pch", "Use precopmiled header support.\n"); |