mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-24 02:22:13 +08:00
140 lines
4.2 KiB
Diff
140 lines
4.2 KiB
Diff
Description: Remove rpath
|
|
Author: Fathi Boudra <fabo@debian.org>
|
|
---
|
|
common.pri | 2 --
|
|
examples/audiodevices/audiodevices.pro | 2 --
|
|
examples/audioinput/audioinput.pro | 2 --
|
|
examples/audiooutput/audiooutput.pro | 2 --
|
|
examples/audiorecorder/audiorecorder.pro | 2 --
|
|
examples/declarative-systeminfo/device/device.pro | 3 ---
|
|
examples/radio/radio.pro | 2 --
|
|
examples/videographicsitem/videographicsitem.pro | 1 -
|
|
examples/videowidget/videowidget.pro | 2 --
|
|
features/basic_examples_setup.pri | 1 -
|
|
features/mobility.prf.template | 1 -
|
|
11 files changed, 20 deletions(-)
|
|
|
|
--- a/common.pri
|
|
+++ b/common.pri
|
|
@@ -115,7 +115,6 @@ contains(build_unit_tests, yes) {
|
|
MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
|
|
RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc
|
|
UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui
|
|
- QMAKE_RPATHDIR += $$QT_MOBILITY_LIB
|
|
} else {
|
|
# Unit test code (no plugins! test plugins are just normal plugins installed elsewhere)
|
|
testcase:QT *= testlib
|
|
@@ -126,7 +125,6 @@ contains(build_unit_tests, yes) {
|
|
MOC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/moc
|
|
RCC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/rcc
|
|
UI_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/ui
|
|
- QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
|
|
}
|
|
|
|
contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
|
|
--- a/examples/audiodevices/audiodevices.pro
|
|
+++ b/examples/audiodevices/audiodevices.pro
|
|
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
|
|
CONFIG += mobility
|
|
MOBILITY = multimedia
|
|
|
|
-QMAKE_RPATHDIR += $$DESTDIR
|
|
-
|
|
HEADERS = audiodevices.h
|
|
|
|
SOURCES = audiodevices.cpp \
|
|
--- a/examples/audioinput/audioinput.pro
|
|
+++ b/examples/audioinput/audioinput.pro
|
|
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
|
|
CONFIG += mobility
|
|
MOBILITY = multimedia
|
|
|
|
-QMAKE_RPATHDIR += $$DESTDIR
|
|
-
|
|
HEADERS = audioinput.h
|
|
|
|
SOURCES = audioinput.cpp \
|
|
--- a/examples/audiooutput/audiooutput.pro
|
|
+++ b/examples/audiooutput/audiooutput.pro
|
|
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
|
|
CONFIG += mobility
|
|
MOBILITY = multimedia
|
|
|
|
-QMAKE_RPATHDIR += $$DESTDIR
|
|
-
|
|
HEADERS = audiooutput.h
|
|
|
|
SOURCES = audiooutput.cpp \
|
|
--- a/examples/audiorecorder/audiorecorder.pro
|
|
+++ b/examples/audiorecorder/audiorecorder.pro
|
|
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
|
|
CONFIG += mobility
|
|
MOBILITY = multimedia
|
|
|
|
-QMAKE_RPATHDIR += $$DESTDIR
|
|
-
|
|
HEADERS = \
|
|
audiorecorder.h
|
|
|
|
--- a/examples/radio/radio.pro
|
|
+++ b/examples/radio/radio.pro
|
|
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
|
|
CONFIG += mobility
|
|
MOBILITY = multimedia
|
|
|
|
-QMAKE_RPATHDIR += $$DESTDIR
|
|
-
|
|
HEADERS = \
|
|
radio.h
|
|
|
|
--- a/examples/videowidget/videowidget.pro
|
|
+++ b/examples/videowidget/videowidget.pro
|
|
@@ -7,8 +7,6 @@ include(../mobility_examples.pri)
|
|
CONFIG += mobility
|
|
MOBILITY = multimedia
|
|
|
|
-QMAKE_RPATHDIR += $$DESTDIR
|
|
-
|
|
HEADERS = \
|
|
videoplayer.h \
|
|
videowidget.h \
|
|
--- a/examples/videographicsitem/videographicsitem.pro
|
|
+++ b/examples/videographicsitem/videographicsitem.pro
|
|
@@ -7,7 +7,6 @@ include(../mobility_examples.pri)
|
|
CONFIG += mobility
|
|
MOBILITY = multimedia
|
|
|
|
-QMAKE_RPATHDIR += $$DESTDIR
|
|
|
|
!symbian:contains(QT_CONFIG, opengl): QT += opengl
|
|
|
|
--- a/features/basic_examples_setup.pri
|
|
+++ b/features/basic_examples_setup.pri
|
|
@@ -42,7 +42,6 @@ mac:contains(QT_CONFIG,qt_framework) {
|
|
}
|
|
QMAKE_LIBDIR = $$OUTPUT_DIR/lib
|
|
|
|
-QMAKE_RPATHDIR+=$$QT_MOBILITY_LIB
|
|
INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
|
|
|
|
maemo6 {
|
|
--- a/features/mobility.prf.template
|
|
+++ b/features/mobility.prf.template
|
|
@@ -36,7 +36,6 @@ defineTest(qtMobilityAddLibrary) {
|
|
LIBS+= -L$${MOBILITY_LIB}
|
|
}
|
|
|
|
-QMAKE_RPATHDIR+=$${MOBILITY_LIB}
|
|
|
|
# versit depends on contacts
|
|
contains(MOBILITY, versit) {
|
|
--- a/examples/declarative-systeminfo/device/device.pro
|
|
+++ b/examples/declarative-systeminfo/device/device.pro
|
|
@@ -17,6 +17,3 @@ symbian {
|
|
}
|
|
RESOURCES += device.qrc
|
|
|
|
-QMAKE_LFLAGS_DEBUG += "-Wl,-rpath,/home/user/qt/lib"
|
|
-QMAKE_LFLAGS_RPATH += "-Wl,-rpath,/home/user/qt/lib"
|
|
-QMAKE_LFLAGS_RELEASE += "-Wl,-rpath,/home/user/qt/lib"
|