Merge lp:~iceyers/gsettings-qt/fix-link-path into lp:gsettings-qt

[Iceyer]

1. Add CONFIG+=ordered to void build failed
2. Fix include path to relative path
3. Add QMAKE_RPATHDIR to fix make check failed

[Iceyer (iceyers)]

The subdir tests depends src, add ordered to avoid multi-thread build failed.

[Khurshid Alam (khurshid-alam)]

@iceyers

It still failing due to mismatched symbols issues on 17.10

Log:
----------------------------------------------------
make[1]: Entering directory '/<<BUILDDIR>>/gsettings-qt-0.1+16.04.20160329+201708220715~ubuntu17.10.1'
dh_makeshlibs -- -c4
dpkg-gensymbols: warning: some new symbols appeared in the symbols file: see diff output below
dpkg-gensymbols: warning: debian/libgsettings-qt1/DEBIAN/symbols doesn't match completely debian/libgsettings-qt1.symbols
--- debian/libgsettings-qt1.symbols (libgsettings-qt1_0.1+16.04.20160329+201708220715~ubuntu17.10.1_i386)
+++ dpkg-gensymbolsRs4cJ4 2017-08-22 07:18:42.671110748 +0000
@@ -25,6 +25,10 @@
  (c++)"QMapNode<QString, QVariant>::copy(QMapData<QString, QVariant>*) const@Base" 0.1+14.10.20140801.1
  (c++)"QMapNode<QString, QVariant>::destroySubTree()@Base" 0.1+14.10.20140801.1
  (c++)"QString::~QString()@Base" 0.1+14.04.20140408
+ _ZN4QMapI7QString8QVariantEC1ERKS2_@Base 0.1+16.04.20160329+201708220715~ubuntu17.10.1
+ _ZN4QMapI7QString8QVariantEC2ERKS2_@Base 0.1+16.04.20160329+201708220715~ubuntu17.10.1
+ _ZN5QListI7QStringEC1ERKS1_@Base 0.1+16.04.20160329+201708220715~ubuntu17.10.1
+ _ZN5QListI7QStringEC2ERKS1_@Base 0.1+16.04.20160329+201708220715~ubuntu17.10.1
  (optional=templinst)_ZN8QMapDataI7QString8QVariantE7destroyEv@Base 0.1+16.04.20160329-0ubuntu2
  (c++)"qconf_types_collect_from_variant(_GVariantType const*, QVariant const&)@Base" 0.1+14.04.20140408
  (c++)"qconf_types_convert(_GVariantType const*)@Base" 0.1+14.04.20140408
dh_makeshlibs: failing due to earlier errors

https://launchpadlibrarian.net/334153567/buildlog_ubuntu-artful-i386.gsettings-qt_0.1+16.04.20160329+201708220715~ubuntu17.10.1_BUILDING.txt.gz

Unmerged revisions

86. By Iceyer on 2017-08-04

Fix make check failed

85. By Iceyer on 2017-07-21

Add ordered config

84. By iceyer@iceyer-PC on 2017-07-20

Fix link path error

=== modified file 'GSettings/gsettings-qt.pro'
--- GSettings/gsettings-qt.pro	2013-08-06 13:34:21 +0000
+++ GSettings/gsettings-qt.pro	2017-08-04 11:10:22 +0000
@@ -4,7 +4,7 @@
 CONFIG += qt plugin no_keywords link_pkgconfig
 PKGCONFIG += gio-2.0
 INCLUDEPATH += ../src .
-LIBS += -L../src -lgsettings-qt
+LIBS += -L$$(PWD)/../src -lgsettings-qt
 
 TARGET = GSettingsQmlPlugin
 

=== modified file 'gsettings-qt.pro'
--- gsettings-qt.pro	2015-06-02 13:39:14 +0000
+++ gsettings-qt.pro	2017-08-04 11:10:22 +0000
@@ -1,2 +1,7 @@
 TEMPLATE = subdirs
-SUBDIRS += src/gsettings-qt.pro GSettings/gsettings-qt.pro tests/tests.pro tests/cpptest.pro
+CONFIG += ordered
+SUBDIRS += \
+    src/gsettings-qt.pro \
+    GSettings/gsettings-qt.pro \
+    tests/tests.pro \
+    tests/cpptest.pro

=== modified file 'tests/cpptest.pro'
--- tests/cpptest.pro	2016-07-26 06:49:27 +0000
+++ tests/cpptest.pro	2017-08-04 11:10:22 +0000
@@ -3,7 +3,8 @@
 QT -= gui
 CONFIG += testcase link_pkgconfig
 TARGET = cpptest
-IMPORTPATH = $$PWD/..
+IMPORTPATH = $$(PWD)/..
+QMAKE_RPATHDIR += $$(PWD)/../src
 SOURCES = cpptest.cpp
 INCLUDEPATH += $$(PWD)/../src
 LIBS += -L$$(PWD)/../src -lgsettings-qt

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2016-07-26 06:49:27 +0000
+++ tests/tests.pro	2017-08-04 11:10:22 +0000
@@ -4,6 +4,7 @@
 CONFIG += qmltestcase
 TARGET = test
 IMPORTPATH = $$PWD/..
+QMAKE_RPATHDIR += $$PWD/../src
 SOURCES = test.cpp
 
 schema.target = gschemas.compiled