38 lines
2.0 KiB
Diff
38 lines
2.0 KiB
Diff
|
diff -up qt-mobility-opensource-src-1.2.2/common.pri.no_rpath qt-mobility-opensource-src-1.2.2/common.pri
|
||
|
|
--- qt-mobility-opensource-src-1.2.2/common.pri.no_rpath 2014-03-25 14:26:00.000000000 -0500
|
||
|
|
+++ qt-mobility-opensource-src-1.2.2/common.pri 2014-04-28 12:04:08.741039693 -0500
|
||
|
|
@@ -105,7 +105,7 @@ 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
|
||
|
|
+ #QMAKE_RPATHDIR += $$QT_MOBILITY_LIB
|
||
|
|
} else {
|
||
|
|
# Unit test code (no plugins! test plugins are just normal plugins installed elsewhere)
|
||
|
|
testcase:QT *= testlib
|
||
|
|
diff -up qt-mobility-opensource-src-1.2.2/features/basic_examples_setup.pri.no_rpath qt-mobility-opensource-src-1.2.2/features/basic_examples_setup.pri
|
||
|
|
--- qt-mobility-opensource-src-1.2.2/features/basic_examples_setup.pri.no_rpath 2014-03-25 14:26:00.000000000 -0500
|
||
|
|
+++ qt-mobility-opensource-src-1.2.2/features/basic_examples_setup.pri 2014-04-28 12:12:15.075887547 -0500
|
||
|
|
@@ -42,7 +42,7 @@ mac:contains(QT_CONFIG,qt_framework) {
|
||
|
|
}
|
||
|
|
QMAKE_LIBDIR = $$OUTPUT_DIR/lib
|
||
|
|
|
||
|
|
-QMAKE_RPATHDIR+=$$QT_MOBILITY_LIB
|
||
|
|
+#QMAKE_RPATHDIR+=$$QT_MOBILITY_LIB
|
||
|
|
INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
|
||
|
|
|
||
|
|
maemo6 {
|
||
|
|
diff -up qt-mobility-opensource-src-1.2.2/features/mobility.prf.no_rpath qt-mobility-opensource-src-1.2.2/features/mobility.prf
|
||
|
|
diff -up qt-mobility-opensource-src-1.2.2/features/mobility.prf.template.no_rpath qt-mobility-opensource-src-1.2.2/features/mobility.prf.template
|
||
|
|
--- qt-mobility-opensource-src-1.2.2/features/mobility.prf.template.no_rpath 2014-03-25 14:26:00.000000000 -0500
|
||
|
|
+++ qt-mobility-opensource-src-1.2.2/features/mobility.prf.template 2014-04-28 12:12:02.418021642 -0500
|
||
|
|
@@ -36,7 +36,7 @@ defineTest(qtMobilityAddLibrary) {
|
||
|
|
LIBS+= -L$${MOBILITY_LIB}
|
||
|
|
}
|
||
|
|
|
||
|
|
-QMAKE_RPATHDIR+=$${MOBILITY_LIB}
|
||
|
|
+#QMAKE_RPATHDIR+=$${MOBILITY_LIB}
|
||
|
|
|
||
|
|
# versit depends on contacts
|
||
|
|
contains(MOBILITY, versit) {
|