diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-02 00:06:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-02 00:06:28 (GMT) |
| commit | e85d90b6d4aa475f5529fb1e3a40fe3afb7f8480 (patch) | |
| tree | 06bc14186438ddc58ad91c0882fd9260c11f030f | |
| parent | ef19008e67b421b7597d8a6bfcd9dab99fe01e48 (diff) | |
| parent | 49c4fc384ce7e762fa47c2645654d3e2a1778469 (diff) | |
| download | Qt-e85d90b6d4aa475f5529fb1e3a40fe3afb7f8480.zip Qt-e85d90b6d4aa475f5529fb1e3a40fe3afb7f8480.tar.gz Qt-e85d90b6d4aa475f5529fb1e3a40fe3afb7f8480.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove workarounds for -rpath-link options
| -rw-r--r-- | mkspecs/linux-g++-maemo/qmake.conf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf index 38c26a6..822266f 100644 --- a/mkspecs/linux-g++-maemo/qmake.conf +++ b/mkspecs/linux-g++-maemo/qmake.conf @@ -12,9 +12,6 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../common/g++.conf) include(../common/linux.conf) -# Work round scratchbox not having standard paths in it's default search path -QMAKE_LFLAGS += -Wl,-rpath-link=/lib -QMAKE_LFLAGS += -Wl,-rpath-link=/usr/lib # Override the default lib/include directories for scratchbox: QMAKE_INCDIR_X11 = /usr/include/X11 |