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/common | |
| 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/common')
| -rw-r--r-- | mkspecs/common/g++.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/llvm.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/mac-g++.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/mac-llvm.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/mac.conf | 2 |
5 files changed, 5 insertions, 5 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 |