diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-04-20 18:19:07 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-04-30 15:02:35 (GMT) |
| commit | 3571445cce1e32665a893d6d20a2c14dec494686 (patch) | |
| tree | 4e7e46a48469bfe62d894a031d5ec5b94e5d3efb /mkspecs | |
| parent | 487be64194a23ff44dd1d4ee861a39b3cfdbd0ea (diff) | |
| download | Qt-3571445cce1e32665a893d6d20a2c14dec494686.zip Qt-3571445cce1e32665a893d6d20a2c14dec494686.tar.gz Qt-3571445cce1e32665a893d6d20a2c14dec494686.tar.bz2 | |
s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/
Reviewed-by: joerg
Diffstat (limited to 'mkspecs')
50 files changed, 50 insertions, 50 deletions
diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf index 25d447c..d3db24a 100644 --- a/mkspecs/common/g++.conf +++ b/mkspecs/common/g++.conf @@ -43,7 +43,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/mkspecs/common/llvm.conf b/mkspecs/common/llvm.conf index aee3904..70f52aa 100644 --- a/mkspecs/common/llvm.conf +++ b/mkspecs/common/llvm.conf @@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/mkspecs/common/mac-g++.conf b/mkspecs/common/mac-g++.conf index 1863898..446547d 100644 --- a/mkspecs/common/mac-g++.conf +++ b/mkspecs/common/mac-g++.conf @@ -67,7 +67,7 @@ QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE} QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE} # -all_load requred to make Objective-C categories work in static builds. QMAKE_LFLAGS_STATIC_LIB += -all_load -QMAKE_RPATH += +QMAKE_LFLAGS_RPATH += QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/mkspecs/common/mac-llvm.conf b/mkspecs/common/mac-llvm.conf index 55850c6..4ff088c 100644 --- a/mkspecs/common/mac-llvm.conf +++ b/mkspecs/common/mac-llvm.conf @@ -65,7 +65,7 @@ QMAKE_LFLAGS_PPC += -arch ppc QMAKE_LFLAGS_X86 += -arch i386 QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE} QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE} -QMAKE_RPATH += +QMAKE_LFLAGS_RPATH += QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 5d88ac4..96cd239 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -14,7 +14,7 @@ QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ QMAKE_FIX_RPATH = install_name_tool -id -QMAKE_RPATH = +QMAKE_LFLAGS_RPATH = QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index af9881b..29d0958 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf @@ -57,7 +57,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_CYGWIN_SHLIB = 1 QMAKE_CYGWIN_EXE = 1 diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf index 995679e..fc55503 100644 --- a/mkspecs/darwin-g++/qmake.conf +++ b/mkspecs/darwin-g++/qmake.conf @@ -69,7 +69,7 @@ QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE} QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE} -QMAKE_RPATH = +QMAKE_LFLAGS_RPATH = QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_X11 = -lXext -lX11 -lm diff --git a/mkspecs/freebsd-g++34/qmake.conf b/mkspecs/freebsd-g++34/qmake.conf index 3e6bf6a..810efab 100644 --- a/mkspecs/freebsd-g++34/qmake.conf +++ b/mkspecs/freebsd-g++34/qmake.conf @@ -57,7 +57,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -pthread -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/freebsd-g++40/qmake.conf b/mkspecs/freebsd-g++40/qmake.conf index 43d6980..4b0ac4c 100644 --- a/mkspecs/freebsd-g++40/qmake.conf +++ b/mkspecs/freebsd-g++40/qmake.conf @@ -57,7 +57,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -pthread -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf index c9c3140..99d6126 100644 --- a/mkspecs/freebsd-icc/qmake.conf +++ b/mkspecs/freebsd-icc/qmake.conf @@ -80,7 +80,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Qoption,ld,-soname, QMAKE_LFLAGS_THREAD = -mt -QMAKE_RPATH = -Qoption,ld,-rpath, +QMAKE_LFLAGS_RPATH = -Qoption,ld,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf index b138ef8..38c8555 100644 --- a/mkspecs/hpux-acc-64/qmake.conf +++ b/mkspecs/hpux-acc-64/qmake.conf @@ -98,7 +98,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,+h, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -Wl,+noallowunsats -QMAKE_RPATH = -Wl,+b, +QMAKE_LFLAGS_RPATH = -Wl,+b, QMAKE_HPUX_SHLIB = 3 QMAKE_EXTENSION_SHLIB = sl diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf index b703540..630129c 100644 --- a/mkspecs/hpux-acc-o64/qmake.conf +++ b/mkspecs/hpux-acc-o64/qmake.conf @@ -95,7 +95,7 @@ QMAKE_LFLAGS_SHLIB = -b QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,+h, QMAKE_LFLAGS_NOUNDEF = -Wl,+noallowunsats -QMAKE_RPATH = -Wl,+b, +QMAKE_LFLAGS_RPATH = -Wl,+b, QMAKE_HPUX_SHLIB = 2 QMAKE_EXTENSION_SHLIB = sl diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf index 8223a07..1c732c6 100644 --- a/mkspecs/hpux-acc/qmake.conf +++ b/mkspecs/hpux-acc/qmake.conf @@ -77,7 +77,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,+h, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -Wl,+noallowunsats -QMAKE_RPATH = -Wl,+b, +QMAKE_LFLAGS_RPATH = -Wl,+b, QMAKE_HPUX_SHLIB = 1 QMAKE_EXTENSION_SHLIB = sl diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf index 734a5f7..d8b0a4a 100644 --- a/mkspecs/hpux-g++-64/qmake.conf +++ b/mkspecs/hpux-g++-64/qmake.conf @@ -60,7 +60,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,+h, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -Wl,+noallowunsats -QMAKE_RPATH = -Wl,+b, +QMAKE_LFLAGS_RPATH = -Wl,+b, QMAKE_HPUX_SHLIB = 3 QMAKE_EXTENSION_SHLIB = sl diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf index 6935ea9..312c44b 100644 --- a/mkspecs/hpux-g++/qmake.conf +++ b/mkspecs/hpux-g++/qmake.conf @@ -60,7 +60,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,+h, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -Wl,+noallowunsats -QMAKE_RPATH = -Wl,+b, +QMAKE_LFLAGS_RPATH = -Wl,+b, QMAKE_HPUX_SHLIB = 1 QMAKE_EXTENSION_SHLIB = sl diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf index 93006e5..a26cb32 100644 --- a/mkspecs/hpuxi-acc-32/qmake.conf +++ b/mkspecs/hpuxi-acc-32/qmake.conf @@ -54,7 +54,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,+h, QMAKE_LFLAGS_NOUNDEF = -Wl,+noallowunsats QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = +QMAKE_LFLAGS_RPATH = QMAKE_LIBS = -lm QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf index 2fa1f01..3e2d59f 100644 --- a/mkspecs/hpuxi-acc-64/qmake.conf +++ b/mkspecs/hpuxi-acc-64/qmake.conf @@ -97,7 +97,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,+h, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -Wl,+noallowunsats -QMAKE_RPATH = +QMAKE_LFLAGS_RPATH = QMAKE_LIBS = -lm QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf index 05b0691..3151d85 100644 --- a/mkspecs/hpuxi-g++-64/qmake.conf +++ b/mkspecs/hpuxi-g++-64/qmake.conf @@ -65,7 +65,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,+h, QMAKE_LFLAGS_THREAD = -lpthread QMAKE_LFLAGS_NOUNDEF = -Wl,+noallowunsats -QMAKE_RPATH = -Wl,+b, +QMAKE_LFLAGS_RPATH = -Wl,+b, QMAKE_LIBS = -lm QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf index 4b651b2..b8d316e 100644 --- a/mkspecs/irix-cc-64/qmake.conf +++ b/mkspecs/irix-cc-64/qmake.conf @@ -88,7 +88,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -Wl,-no_unresolved -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf index 0070d42..2f4f03f 100644 --- a/mkspecs/irix-cc/qmake.conf +++ b/mkspecs/irix-cc/qmake.conf @@ -88,7 +88,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -Wl,-no_unresolved -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf index 56f02f1..610d92c 100644 --- a/mkspecs/irix-g++-64/qmake.conf +++ b/mkspecs/irix-g++-64/qmake.conf @@ -58,7 +58,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -Wl,-no_unresolved -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = -lC QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf index c1eafdb..41841f3 100644 --- a/mkspecs/irix-g++/qmake.conf +++ b/mkspecs/irix-g++/qmake.conf @@ -58,7 +58,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -Wl,-no_unresolved -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = -lC QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf index 21f2960..aa50b87 100644 --- a/mkspecs/linux-ecc-64/qmake.conf +++ b/mkspecs/linux-ecc-64/qmake.conf @@ -56,7 +56,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Qoption,ld,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Qoption,ld,-rpath, +QMAKE_LFLAGS_RPATH = -Qoption,ld,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index eeb24a3..3353180 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -62,7 +62,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Qoption,ld,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Qoption,ld,-rpath, +QMAKE_LFLAGS_RPATH = -Qoption,ld,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf index 217572f..5c6001c 100644 --- a/mkspecs/linux-kcc/qmake.conf +++ b/mkspecs/linux-kcc/qmake.conf @@ -65,7 +65,7 @@ QMAKE_LFLAGS_SHLIB = QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = --soname$$LITERAL_WHITESPACE QMAKE_LFLAGS_THREAD = --thread_safe -QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE +QMAKE_LFLAGS_RPATH = -rpath$$LITERAL_WHITESPACE QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/linux-lsb-g++/qmake.conf b/mkspecs/linux-lsb-g++/qmake.conf index 4b4deab..d359625 100644 --- a/mkspecs/linux-lsb-g++/qmake.conf +++ b/mkspecs/linux-lsb-g++/qmake.conf @@ -62,7 +62,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf index 19af8ee..16d0023 100644 --- a/mkspecs/linux-pgcc/qmake.conf +++ b/mkspecs/linux-pgcc/qmake.conf @@ -56,7 +56,7 @@ QMAKE_LFLAGS_SHLIB = -shared -fpic QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -R +QMAKE_LFLAGS_RPATH = -R QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf index eae3308..fc0fc43 100644 --- a/mkspecs/lynxos-g++/qmake.conf +++ b/mkspecs/lynxos-g++/qmake.conf @@ -59,7 +59,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index 00de6c4..d93ed5e 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -70,7 +70,7 @@ QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE} QMAKE_LFLAGS_THREAD = #QMAKE_LFLAGS_PPC = -arch ppc #QMAKE_LFLAGS_X86 = -arch i386 -QMAKE_RPATH = +QMAKE_LFLAGS_RPATH = QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE} diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index 1cb449f..1d3fd2b 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf @@ -58,7 +58,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -pthread QMAKE_LFLAGS_NOUNDEF = -Wl,-no_unresolved -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/qws/freebsd-generic-g++/qmake.conf b/mkspecs/qws/freebsd-generic-g++/qmake.conf index 6e30d4f..d50ce6b 100644 --- a/mkspecs/qws/freebsd-generic-g++/qmake.conf +++ b/mkspecs/qws/freebsd-generic-g++/qmake.conf @@ -56,7 +56,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -pthread -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = QMAKE_LIBS_QT = -lqte diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf index f753222..9096712 100644 --- a/mkspecs/qws/macx-generic-g++/qmake.conf +++ b/mkspecs/qws/macx-generic-g++/qmake.conf @@ -57,7 +57,7 @@ QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace QMAKE_LFLAGS_PLUGIN = -bundle QMAKE_LFLAGS_SONAME = QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = +QMAKE_LFLAGS_RPATH = QMAKE_LIBS = QMAKE_LIBS_X11 = diff --git a/mkspecs/qws/solaris-generic-g++/qmake.conf b/mkspecs/qws/solaris-generic-g++/qmake.conf index f5874c2..3bf7e56 100644 --- a/mkspecs/qws/solaris-generic-g++/qmake.conf +++ b/mkspecs/qws/solaris-generic-g++/qmake.conf @@ -57,7 +57,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = -lsocket -lnsl -lresolv QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf index 746cf2c..d4091ff 100644 --- a/mkspecs/sco-g++/qmake.conf +++ b/mkspecs/sco-g++/qmake.conf @@ -55,7 +55,7 @@ QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -G QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE -QMAKE_RPATH = +QMAKE_LFLAGS_RPATH = QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index 3d35d62..a026756 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf @@ -76,7 +76,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE QMAKE_LFLAGS_THREAD = -mt QMAKE_LFLAGS_NOUNDEF = -z defs -QMAKE_RPATH = -R +QMAKE_LFLAGS_RPATH = -R QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index 0c97620..8a8f1ac 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf @@ -59,7 +59,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE QMAKE_LFLAGS_THREAD = -mt QMAKE_LFLAGS_NOUNDEF = -z defs -QMAKE_RPATH = -R +QMAKE_LFLAGS_RPATH = -R QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf index 587c630..01e331c 100644 --- a/mkspecs/solaris-g++-64/qmake.conf +++ b/mkspecs/solaris-g++-64/qmake.conf @@ -80,7 +80,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -z defs -QMAKE_RPATH = -Wl,-R, +QMAKE_LFLAGS_RPATH = -Wl,-R, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf index 0814980..c7f6406 100644 --- a/mkspecs/solaris-g++/qmake.conf +++ b/mkspecs/solaris-g++/qmake.conf @@ -63,7 +63,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_NOUNDEF = -z defs -QMAKE_RPATH = -Wl,-R, +QMAKE_LFLAGS_RPATH = -Wl,-R, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf index c75e46e..57bb56a 100644 --- a/mkspecs/symbian/linux-gcce/qmake.conf +++ b/mkspecs/symbian/linux-gcce/qmake.conf @@ -47,7 +47,7 @@ QMAKE_CXXFLAGS_STATIC_LIB -= -fPIC QMAKE_LFLAGS_SONAME = #QMAKE_LFLAGS_THREAD += #QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined -QMAKE_RPATH = --rpath= +QMAKE_LFLAGS_RPATH = --rpath= DEFINES += __GCCE__ \ UNICODE \ diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf index 88021df..d2c6937 100644 --- a/mkspecs/tru64-cxx/qmake.conf +++ b/mkspecs/tru64-cxx/qmake.conf @@ -54,7 +54,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_THREAD = -pthread QMAKE_LFLAGS_SONAME = -soname$$LITERAL_WHITESPACE -QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE +QMAKE_LFLAGS_RPATH = -rpath$$LITERAL_WHITESPACE QMAKE_LIBS = -lm QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf index 71e5682..f2b8e39 100644 --- a/mkspecs/tru64-g++/qmake.conf +++ b/mkspecs/tru64-g++/qmake.conf @@ -56,7 +56,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_SONAME = -Wl,-soname, -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf index 5fb2b2c..5f88b80 100644 --- a/mkspecs/unixware-cc/qmake.conf +++ b/mkspecs/unixware-cc/qmake.conf @@ -57,7 +57,7 @@ QMAKE_LFLAGS_SHLIB = -G QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE QMAKE_LFLAGS_THREAD = -Kthread -QMAKE_RPATH = -R +QMAKE_LFLAGS_RPATH = -R QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf index b6a438a..34d6d61 100644 --- a/mkspecs/unixware-g++/qmake.conf +++ b/mkspecs/unixware-g++/qmake.conf @@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-R, +QMAKE_LFLAGS_RPATH = -Wl,-R, QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf index 7b17789..38849f8 100644 --- a/mkspecs/unsupported/linux-host-g++/qmake.conf +++ b/mkspecs/unsupported/linux-host-g++/qmake.conf @@ -63,7 +63,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/mkspecs/unsupported/qws/qnx-641/qmake.conf b/mkspecs/unsupported/qws/qnx-641/qmake.conf index 12eaf1d..441f408 100644 --- a/mkspecs/unsupported/qws/qnx-641/qmake.conf +++ b/mkspecs/unsupported/qws/qnx-641/qmake.conf @@ -51,7 +51,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = QMAKE_LN_SHLIB = -cp -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf index 62857bf..26de9b7 100644 --- a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf +++ b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf @@ -53,7 +53,7 @@ QMAKE_LFLAGS_SHLIB += -shared QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf index dce60ea..b43c391 100644 --- a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf +++ b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf @@ -49,7 +49,7 @@ QMAKE_LFLAGS_SHLIB += -shared QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf index 93d04ff..29a2952 100644 --- a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf +++ b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf @@ -49,7 +49,7 @@ QMAKE_LFLAGS_SHLIB += -shared QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf index fc0b125..e3eb6cd 100644 --- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf +++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf @@ -53,7 +53,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += QMAKE_LFLAGS_THREAD += QMAKE_LFLAGS_NOUNDEF += -QMAKE_RPATH = +QMAKE_LFLAGS_RPATH = QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf index be35172..d0aeff6 100644 --- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf +++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf @@ -53,7 +53,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += QMAKE_LFLAGS_THREAD += QMAKE_LFLAGS_NOUNDEF += -QMAKE_RPATH = +QMAKE_LFLAGS_RPATH = QMAKE_PCH_OUTPUT_EXT = .gch |