gsettings-qt

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

  1. fix-link-path
  2. Merge into trunk
Proposed by Iceyer
Status: Superseded
Proposed branch: lp:~iceyers/gsettings-qt/fix-link-path
Merge into: lp:gsettings-qt
Diff against target: 51 lines (+10/-3)
4 files modified
GSettings/gsettings-qt.pro (+1/-1)
gsettings-qt.pro (+6/-1)
tests/cpptest.pro (+2/-1)
tests/tests.pro (+1/-0)
To merge this branch: bzr merge lp:~iceyers/gsettings-qt/fix-link-path
Reviewer Review Type Date Requested Status
Lars Karlitski Pending
Review via email: mp+327852@code.launchpad.net

This proposal supersedes a proposal from 2017-07-20.

This proposal has been superseded by a proposal from 2017-08-04.

Description of the change

Fix build failed when link path error

To post a comment you must log in.
Revision history for this message
Iceyer (iceyers) wrote :

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

lp:~iceyers/gsettings-qt/fix-link-path updated
86. By Iceyer

Fix make check failed

Unmerged revisions

86. By Iceyer

Fix make check failed

85. By Iceyer

Add ordered config

84. By iceyer@iceyer-PC

Fix link path error

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GSettings/gsettings-qt.pro'
2--- GSettings/gsettings-qt.pro 2013-08-06 13:34:21 +0000
3+++ GSettings/gsettings-qt.pro 2017-08-04 11:07:15 +0000
4@@ -4,7 +4,7 @@
5 CONFIG += qt plugin no_keywords link_pkgconfig
6 PKGCONFIG += gio-2.0
7 INCLUDEPATH += ../src .
8-LIBS += -L../src -lgsettings-qt
9+LIBS += -L$$(PWD)/../src -lgsettings-qt
10
11 TARGET = GSettingsQmlPlugin
12
13
14=== modified file 'gsettings-qt.pro'
15--- gsettings-qt.pro 2015-06-02 13:39:14 +0000
16+++ gsettings-qt.pro 2017-08-04 11:07:15 +0000
17@@ -1,2 +1,7 @@
18 TEMPLATE = subdirs
19-SUBDIRS += src/gsettings-qt.pro GSettings/gsettings-qt.pro tests/tests.pro tests/cpptest.pro
20+CONFIG += ordered
21+SUBDIRS += \
22+ src/gsettings-qt.pro \
23+ GSettings/gsettings-qt.pro \
24+ tests/tests.pro \
25+ tests/cpptest.pro
26
27=== modified file 'tests/cpptest.pro'
28--- tests/cpptest.pro 2016-07-26 06:49:27 +0000
29+++ tests/cpptest.pro 2017-08-04 11:07:15 +0000
30@@ -3,7 +3,8 @@
31 QT -= gui
32 CONFIG += testcase link_pkgconfig
33 TARGET = cpptest
34-IMPORTPATH = $$PWD/..
35+IMPORTPATH = $$(PWD)/..
36+QMAKE_RPATHDIR += $$(PWD)/../src
37 SOURCES = cpptest.cpp
38 INCLUDEPATH += $$(PWD)/../src
39 LIBS += -L$$(PWD)/../src -lgsettings-qt
40
41=== modified file 'tests/tests.pro'
42--- tests/tests.pro 2016-07-26 06:49:27 +0000
43+++ tests/tests.pro 2017-08-04 11:07:15 +0000
44@@ -4,6 +4,7 @@
45 CONFIG += qmltestcase
46 TARGET = test
47 IMPORTPATH = $$PWD/..
48+QMAKE_RPATHDIR += $$PWD/../src
49 SOURCES = test.cpp
50
51 schema.target = gschemas.compiled

Subscribers

People subscribed via source and target branches

to all changes: