Merge lp:~online-accounts/signon/packaging into lp:signon

Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: no longer in the source branch.
Merged at revision: 630
Proposed branch: lp:~online-accounts/signon/packaging
Merge into: lp:signon
Diff against target: 663 lines (+172/-60)
27 files modified
common-project-config.pri (+0/-2)
debian/changelog (+7/-0)
lib/SignOn/async-dbus-proxy.cpp (+2/-2)
lib/SignOn/authservice.cpp (+4/-1)
lib/SignOn/authserviceimpl.cpp (+2/-2)
lib/SignOn/authsession.cpp (+4/-1)
lib/SignOn/authsessionimpl.cpp (+2/-2)
lib/SignOn/connection-manager.cpp (+1/-0)
lib/SignOn/dbusinterface.cpp (+2/-0)
lib/SignOn/debug.cpp (+42/-0)
lib/SignOn/debug.h (+62/-0)
lib/SignOn/identity.cpp (+4/-1)
lib/SignOn/identityimpl.cpp (+2/-2)
lib/SignOn/identityinfo.cpp (+2/-1)
lib/SignOn/identityinfoimpl.cpp (+2/-1)
lib/SignOn/libsignon-qt.pri (+11/-9)
lib/SignOn/libsignoncommon.h (+1/-27)
lib/plugins/signon-plugins-common/signon-plugins-common.pro (+2/-1)
lib/plugins/signon-plugins.pro (+2/-0)
src/plugins/plugins.pri (+2/-1)
src/remotepluginprocess/remotepluginprocess.pro (+2/-1)
src/signond/signond.pro (+2/-1)
tests/libsignon-qt-tests/libsignon-qt-tests.pro (+2/-0)
tests/passwordplugintest/passwordplugintest.pro (+2/-1)
tests/signond-tests/identity-tool.pro (+2/-1)
tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro (+2/-1)
tests/signond-tests/signond-tests.pri (+4/-2)
To merge this branch: bzr merge lp:~online-accounts/signon/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email: mp+276619@code.launchpad.net

Commit message

Lib: hide debug output by default

Introduce a LIBSIGNON_LOGGING_LEVEL environment variable which can be
set to "2" in order to enable debugging output (or to "0" to hide also
warning messages).

Description of the change

Lib: hide debug output by default

Introduce a LIBSIGNON_LOGGING_LEVEL environment variable which can be
set to "2" in order to enable debugging output (or to "0" to hide also
warning messages).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~online-accounts/signon/packaging updated
630. By Alberto Mardegan on 2015-11-06

Lib: hide debug output by default

Introduce a LIBSIGNON_LOGGING_LEVEL environment variable which can be
set to "2" in order to enable debugging output (or to "0" to hide also
warning messages).
 Fixes: #1415492
Approved by: PS Jenkins bot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common-project-config.pri'
2--- common-project-config.pri 2014-03-14 10:51:51 +0000
3+++ common-project-config.pri 2015-11-04 07:28:42 +0000
4@@ -25,8 +25,6 @@
5
6 TOP_SRC_DIR = $$PWD
7 TOP_BUILD_DIR = $${TOP_SRC_DIR}/$${BUILD_DIR}
8-QMAKE_LIBDIR += $${TOP_BUILD_DIR}/lib/SignOn
9-INCLUDEPATH += $${TOP_SRC_DIR}/lib
10
11 #DEFINES += QT_NO_DEBUG_OUTPUT
12 DEFINES += DEBUG_ENABLED
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2015-10-28 15:59:39 +0000
16+++ debian/changelog 2015-11-04 07:28:42 +0000
17@@ -1,3 +1,10 @@
18+signon (8.58+16.04.20151028-0ubuntu2) UNRELEASED; urgency=medium
19+
20+ * Merge from upstream
21+ - Lib: hide debug output by default (LP: #1404267)
22+
23+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 04 Nov 2015 10:19:00 +0300
24+
25 signon (8.58+16.04.20151028-0ubuntu1) xenial; urgency=medium
26
27 [ Alberto Mardegan ]
28
29=== modified file 'lib/SignOn/async-dbus-proxy.cpp'
30--- lib/SignOn/async-dbus-proxy.cpp 2013-07-29 13:52:21 +0000
31+++ lib/SignOn/async-dbus-proxy.cpp 2015-11-04 07:28:42 +0000
32@@ -2,9 +2,8 @@
33 * This file is part of signon
34 *
35 * Copyright (C) 2009-2010 Nokia Corporation.
36- * Copyright (C) 2013 Canonical Ltd.
37+ * Copyright (C) 2013-2015 Canonical Ltd.
38 *
39- * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
40 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
41 *
42 * This library is free software; you can redistribute it and/or
43@@ -33,6 +32,7 @@
44
45 #include "connection-manager.h"
46 #include "dbusinterface.h"
47+#include "debug.h"
48 #include "libsignoncommon.h"
49 #include "signond/signoncommon.h"
50
51
52=== modified file 'lib/SignOn/authservice.cpp'
53--- lib/SignOn/authservice.cpp 2012-04-18 13:06:27 +0000
54+++ lib/SignOn/authservice.cpp 2015-11-04 07:28:42 +0000
55@@ -2,8 +2,8 @@
56 * This file is part of signon
57 *
58 * Copyright (C) 2009-2010 Nokia Corporation.
59+ * Copyright (C) 2011-2015 Canonical Ltd.
60 *
61- * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
62 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
63 *
64 * This library is free software; you can redistribute it and/or
65@@ -22,12 +22,15 @@
66 */
67 #include "authservice.h"
68 #include "authserviceimpl.h"
69+#include "debug.h"
70
71 namespace SignOn {
72
73 AuthService::AuthService(QObject *parent): QObject(parent),
74 impl(new AuthServiceImpl(this))
75 {
76+ initDebug();
77+
78 qRegisterMetaType<Error>("SignOn::Error");
79 qRegisterMetaType<Error>("Error");
80
81
82=== modified file 'lib/SignOn/authserviceimpl.cpp'
83--- lib/SignOn/authserviceimpl.cpp 2013-07-29 09:23:36 +0000
84+++ lib/SignOn/authserviceimpl.cpp 2015-11-04 07:28:42 +0000
85@@ -2,9 +2,8 @@
86 * This file is part of signon
87 *
88 * Copyright (C) 2009-2010 Nokia Corporation.
89- * Copyright (C) 2013 Canonical Ltd.
90+ * Copyright (C) 2013-2015 Canonical Ltd.
91 *
92- * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
93 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
94 *
95 * This library is free software; you can redistribute it and/or
96@@ -30,6 +29,7 @@
97
98 #include "signond/signoncommon.h"
99
100+#include "debug.h"
101 #include "libsignoncommon.h"
102 #include "identityinfo.h"
103 #include "identityinfoimpl.h"
104
105=== modified file 'lib/SignOn/authsession.cpp'
106--- lib/SignOn/authsession.cpp 2012-04-18 13:06:27 +0000
107+++ lib/SignOn/authsession.cpp 2015-11-04 07:28:42 +0000
108@@ -2,8 +2,8 @@
109 * This file is part of signon
110 *
111 * Copyright (C) 2009-2010 Nokia Corporation.
112+ * Copyright (C) 2011-2015 Canonical Ltd.
113 *
114- * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
115 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
116 *
117 * This library is free software; you can redistribute it and/or
118@@ -27,6 +27,7 @@
119 #include "libsignoncommon.h"
120 #include "authsession.h"
121 #include "authsessionimpl.h"
122+#include "debug.h"
123
124
125 namespace SignOn {
126@@ -36,6 +37,8 @@
127 QObject(parent),
128 impl(new AuthSessionImpl(this, id, methodName))
129 {
130+ initDebug();
131+
132 qRegisterMetaType<SessionData>("SessionData");
133 qRegisterMetaType<AuthSessionState>("AuthSession::AuthSessionState");
134
135
136=== modified file 'lib/SignOn/authsessionimpl.cpp'
137--- lib/SignOn/authsessionimpl.cpp 2015-02-05 09:34:16 +0000
138+++ lib/SignOn/authsessionimpl.cpp 2015-11-04 07:28:42 +0000
139@@ -2,9 +2,8 @@
140 * This file is part of signon
141 *
142 * Copyright (C) 2009-2010 Nokia Corporation.
143- * Copyright (C) 2013 Canonical Ltd.
144+ * Copyright (C) 2013-2015 Canonical Ltd.
145 *
146- * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
147 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
148 *
149 * This library is free software; you can redistribute it and/or
150@@ -24,6 +23,7 @@
151 #include "signond/signoncommon.h"
152
153 #include "authsessionimpl.h"
154+#include "debug.h"
155 #include "libsignoncommon.h"
156
157 #include <QDBusPendingCallWatcher>
158
159=== modified file 'lib/SignOn/connection-manager.cpp'
160--- lib/SignOn/connection-manager.cpp 2014-03-20 13:01:59 +0000
161+++ lib/SignOn/connection-manager.cpp 2015-11-04 07:28:42 +0000
162@@ -21,6 +21,7 @@
163 */
164
165 #include "connection-manager.h"
166+#include "debug.h"
167 #include "libsignoncommon.h"
168 #include "signond/signoncommon.h"
169
170
171=== modified file 'lib/SignOn/dbusinterface.cpp'
172--- lib/SignOn/dbusinterface.cpp 2013-09-06 06:33:01 +0000
173+++ lib/SignOn/dbusinterface.cpp 2015-11-04 07:28:42 +0000
174@@ -2,6 +2,7 @@
175 * This file is part of signon
176 *
177 * Copyright (C) 2011 Nokia Corporation.
178+ * Copyright (C) 2011-2015 Canonical Ltd.
179 *
180 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
181 *
182@@ -21,6 +22,7 @@
183 */
184
185 #include "dbusinterface.h"
186+#include "debug.h"
187 #include "libsignoncommon.h"
188
189 #include <climits>
190
191=== added file 'lib/SignOn/debug.cpp'
192--- lib/SignOn/debug.cpp 1970-01-01 00:00:00 +0000
193+++ lib/SignOn/debug.cpp 2015-11-04 07:28:42 +0000
194@@ -0,0 +1,42 @@
195+/*
196+ * This file is part of signon
197+ *
198+ * Copyright (C) 2015 Canonical Ltd.
199+ *
200+ * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
201+ *
202+ * This library is free software; you can redistribute it and/or
203+ * modify it under the terms of the GNU Lesser General Public License
204+ * version 2.1 as published by the Free Software Foundation.
205+ *
206+ * This library is distributed in the hope that it will be useful, but
207+ * WITHOUT ANY WARRANTY; without even the implied warranty of
208+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
209+ * Lesser General Public License for more details.
210+ *
211+ * You should have received a copy of the GNU Lesser General Public
212+ * License along with this library; if not, write to the Free Software
213+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
214+ * 02110-1301 USA
215+ */
216+
217+#include "debug.h"
218+#include <QByteArray>
219+
220+int libsignon_logging_level = 1;
221+
222+namespace SignOn {
223+
224+void setLoggingLevel(int level) {
225+ libsignon_logging_level = level;
226+}
227+
228+void initDebug() {
229+ QByteArray loggingLevelVar = qgetenv("LIBSIGNON_LOGGING_LEVEL");
230+ if (!loggingLevelVar.isEmpty()) {
231+ setLoggingLevel(loggingLevelVar.toInt());
232+ }
233+}
234+
235+}
236+
237
238=== added file 'lib/SignOn/debug.h'
239--- lib/SignOn/debug.h 1970-01-01 00:00:00 +0000
240+++ lib/SignOn/debug.h 2015-11-04 07:28:42 +0000
241@@ -0,0 +1,62 @@
242+/*
243+ * This file is part of signon
244+ *
245+ * Copyright (C) 2015 Canonical Ltd.
246+ *
247+ * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
248+ *
249+ * This library is free software; you can redistribute it and/or
250+ * modify it under the terms of the GNU Lesser General Public License
251+ * version 2.1 as published by the Free Software Foundation.
252+ *
253+ * This library is distributed in the hope that it will be useful, but
254+ * WITHOUT ANY WARRANTY; without even the implied warranty of
255+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
256+ * Lesser General Public License for more details.
257+ *
258+ * You should have received a copy of the GNU Lesser General Public
259+ * License along with this library; if not, write to the Free Software
260+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
261+ * 02110-1301 USA
262+ */
263+
264+#ifndef LIBSIGNON_DEBUG_H
265+#define LIBSIGNON_DEBUG_H
266+
267+#include <QDebug>
268+
269+#ifdef TRACE
270+ #undef TRACE
271+#endif
272+
273+#ifdef BLAME
274+ #undef BLAME
275+#endif
276+
277+#ifdef DEBUG_ENABLED
278+extern int libsignon_logging_level;
279+static inline bool debugEnabled() {
280+ return libsignon_logging_level >= 2;
281+}
282+
283+static inline bool criticalsEnabled() {
284+ return libsignon_logging_level >= 1;
285+}
286+#define TRACE() \
287+ if (debugEnabled()) qDebug()
288+#define BLAME() \
289+ if (criticalsEnabled()) qCritical()
290+
291+#else // DEBUG_ENABLED
292+ #define TRACE() while (0) qDebug()
293+ #define BLAME() while (0) qDebug()
294+#endif
295+
296+namespace SignOn {
297+
298+void setLoggingLevel(int level);
299+void initDebug();
300+
301+}
302+
303+#endif // LIBSIGNON_DEBUG_H
304
305=== modified file 'lib/SignOn/identity.cpp'
306--- lib/SignOn/identity.cpp 2012-04-18 13:06:27 +0000
307+++ lib/SignOn/identity.cpp 2015-11-04 07:28:42 +0000
308@@ -2,8 +2,8 @@
309 * This file is part of signon
310 *
311 * Copyright (C) 2009-2010 Nokia Corporation.
312+ * Copyright (C) 2011-2015 Canonical Ltd.
313 *
314- * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
315 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
316 *
317 * This library is free software; you can redistribute it and/or
318@@ -21,6 +21,7 @@
319 * 02110-1301 USA
320 */
321
322+#include "debug.h"
323 #include "identityimpl.h"
324 #include "identity.h"
325
326@@ -29,6 +30,8 @@
327 Identity::Identity(const quint32 id, QObject *parent):
328 QObject(parent)
329 {
330+ initDebug();
331+
332 qRegisterMetaType<Error>("SignOn::Error");
333 qRegisterMetaType<Error>("Error");
334
335
336=== modified file 'lib/SignOn/identityimpl.cpp'
337--- lib/SignOn/identityimpl.cpp 2015-07-07 09:52:43 +0000
338+++ lib/SignOn/identityimpl.cpp 2015-11-04 07:28:42 +0000
339@@ -2,9 +2,8 @@
340 * This file is part of signon
341 *
342 * Copyright (C) 2009-2010 Nokia Corporation.
343- * Copyright (C) 2013 Canonical Ltd.
344+ * Copyright (C) 2013-2015 Canonical Ltd.
345 *
346- * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
347 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
348 *
349 * This library is free software; you can redistribute it and/or
350@@ -30,6 +29,7 @@
351
352 #include "signond/signoncommon.h"
353
354+#include "debug.h"
355 #include "libsignoncommon.h"
356 #include "identityimpl.h"
357 #include "identityinfo.h"
358
359=== modified file 'lib/SignOn/identityinfo.cpp'
360--- lib/SignOn/identityinfo.cpp 2013-11-22 14:46:01 +0000
361+++ lib/SignOn/identityinfo.cpp 2015-11-04 07:28:42 +0000
362@@ -2,8 +2,8 @@
363 * This file is part of signon
364 *
365 * Copyright (C) 2009-2010 Nokia Corporation.
366+ * Copyright (C) 2011-2015 Canonical Ltd.
367 *
368- * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
369 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
370 *
371 * This library is free software; you can redistribute it and/or
372@@ -23,6 +23,7 @@
373
374 #include <QVariant>
375
376+#include "debug.h"
377 #include "libsignoncommon.h"
378 #include "identityinfo.h"
379 #include "identityinfoimpl.h"
380
381=== modified file 'lib/SignOn/identityinfoimpl.cpp'
382--- lib/SignOn/identityinfoimpl.cpp 2013-11-22 14:46:01 +0000
383+++ lib/SignOn/identityinfoimpl.cpp 2015-11-04 07:28:42 +0000
384@@ -2,8 +2,8 @@
385 * This file is part of signon
386 *
387 * Copyright (C) 2009-2010 Nokia Corporation.
388+ * Copyright (C) 2011-2015 Canonical Ltd.
389 *
390- * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
391 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
392 *
393 * This library is free software; you can redistribute it and/or
394@@ -20,6 +20,7 @@
395 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
396 * 02110-1301 USA
397 */
398+#include "debug.h"
399 #include "identityinfoimpl.h"
400 #include "identityinfo.h"
401
402
403=== modified file 'lib/SignOn/libsignon-qt.pri'
404--- lib/SignOn/libsignon-qt.pri 2014-03-14 10:51:51 +0000
405+++ lib/SignOn/libsignon-qt.pri 2015-11-04 07:28:42 +0000
406@@ -20,30 +20,33 @@
407 signonerror.h
408
409 private_headers = authserviceimpl.h \
410- identityimpl.h \
411 async-dbus-proxy.h \
412 authsessionimpl.h \
413 connection-manager.h \
414- identityinfoimpl.h \
415- dbusinterface.h
416+ dbusinterface.h \
417+ debug.h \
418+ identityimpl.h \
419+ identityinfoimpl.h
420
421 HEADERS = $$public_headers \
422 $$private_headers
423
424 INCLUDEPATH += . \
425+ .. \
426 $$TOP_SRC_DIR/include
427
428 SOURCES += identityinfo.cpp \
429- identity.cpp \
430- identityimpl.cpp \
431 async-dbus-proxy.cpp \
432 authservice.cpp \
433 authserviceimpl.cpp \
434 authsession.cpp \
435 authsessionimpl.cpp \
436 connection-manager.cpp \
437- identityinfoimpl.cpp \
438- dbusinterface.cpp
439+ dbusinterface.cpp \
440+ debug.cpp \
441+ identity.cpp \
442+ identityimpl.cpp \
443+ identityinfoimpl.cpp
444
445 QT += core \
446 dbus
447@@ -54,8 +57,7 @@
448
449 DEFINES += \
450 QT_NO_CAST_TO_ASCII \
451- QT_NO_CAST_FROM_ASCII \
452- LIBSIGNON_TRACE
453+ QT_NO_CAST_FROM_ASCII
454
455 include( $$TOP_SRC_DIR/common-installs-config.pri )
456
457
458=== modified file 'lib/SignOn/libsignoncommon.h'
459--- lib/SignOn/libsignoncommon.h 2012-04-18 13:06:27 +0000
460+++ lib/SignOn/libsignoncommon.h 2015-11-04 07:28:42 +0000
461@@ -2,8 +2,8 @@
462 * This file is part of signon
463 *
464 * Copyright (C) 2009-2010 Nokia Corporation.
465+ * Copyright (C) 2015 Canonical Ltd.
466 *
467- * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
468 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
469 *
470 * This library is free software; you can redistribute it and/or
471@@ -28,26 +28,6 @@
472 #ifndef LIBSIGNONCOMMON_H
473 #define LIBSIGNONCOMMON_H
474
475-#ifdef LIBSIGNON_TRACE
476- #include <QDebug>
477-
478- #ifdef DEBUG_ENABLED
479- #ifdef TRACE
480- #undef TRACE
481- #endif
482-
483- #ifdef BLAME
484- #undef BLAME
485- #endif
486-
487- #define TRACE() qDebug() << __FILE__ << __LINE__ << __func__
488- #define BLAME() qCritical() << __FILE__ << __LINE__ << __func__
489- #else
490- #define TRACE() while (0) qDebug()
491- #define BLAME() while (0) qCritical()
492- #endif
493-#endif
494-
495 #ifdef SIGNON_EXPORT
496 #undef SIGNON_EXPORT
497 #endif
498@@ -60,10 +40,4 @@
499 #define SIGNON_EXPORT
500 #endif
501
502-/*
503- TODO - Add here a common data container for IdentityInfo,
504- dbus register it and use it as qt dbus type
505- for the signond <--> libsignon communication
506-*/
507-
508 #endif // LIBSIGNONCOMMON_H
509
510=== modified file 'lib/plugins/signon-plugins-common/signon-plugins-common.pro'
511--- lib/plugins/signon-plugins-common/signon-plugins-common.pro 2013-07-11 09:11:03 +0000
512+++ lib/plugins/signon-plugins-common/signon-plugins-common.pro 2015-11-04 07:28:42 +0000
513@@ -8,7 +8,8 @@
514 CONFIG += qt
515 QT += dbus
516
517-INCLUDEPATH += ../
518+INCLUDEPATH += ../ \
519+ $${TOP_SRC_DIR}/lib
520
521 DEFINES += SIGNON_PLUGIN_TRACE
522
523
524=== modified file 'lib/plugins/signon-plugins.pro'
525--- lib/plugins/signon-plugins.pro 2014-01-31 08:42:51 +0000
526+++ lib/plugins/signon-plugins.pro 2015-11-04 07:28:42 +0000
527@@ -5,6 +5,8 @@
528 include($${TOP_SRC_DIR}/common-installs-config.pri)
529 include($${TOP_SRC_DIR}/common-vars.pri)
530
531+INCLUDEPATH += ..
532+
533 HEADERS = \
534 SignOn/authpluginif.h \
535 SignOn/uisessiondata.h \
536
537=== modified file 'src/plugins/plugins.pri'
538--- src/plugins/plugins.pri 2013-02-07 13:24:36 +0000
539+++ src/plugins/plugins.pri 2015-11-04 07:28:42 +0000
540@@ -16,7 +16,8 @@
541
542 DEFINES += SIGNON_PLUGIN_TRACE
543 INCLUDEPATH += . \
544- $$TOP_SRC_DIR/lib/plugins
545+ $$TOP_SRC_DIR/lib/plugins \
546+ $$TOP_SRC_DIR/lib
547 LIBS += -lsignon-plugins
548 QMAKE_LIBDIR += \
549 $${TOP_BUILD_DIR}/lib/plugins
550
551=== modified file 'src/remotepluginprocess/remotepluginprocess.pro'
552--- src/remotepluginprocess/remotepluginprocess.pro 2014-08-25 13:54:03 +0000
553+++ src/remotepluginprocess/remotepluginprocess.pro 2015-11-04 07:28:42 +0000
554@@ -19,7 +19,8 @@
555 $$TOP_SRC_DIR/src/plugins \
556 $$TOP_SRC_DIR/src/signond \
557 $$TOP_SRC_DIR/lib/plugins/signon-plugins-common \
558- $$TOP_SRC_DIR/lib/plugins
559+ $$TOP_SRC_DIR/lib/plugins \
560+ $$TOP_SRC_DIR/lib
561
562 CONFIG += \
563 build_all \
564
565=== modified file 'src/signond/signond.pro'
566--- src/signond/signond.pro 2013-07-29 13:52:21 +0000
567+++ src/signond/signond.pro 2015-11-04 07:28:42 +0000
568@@ -60,7 +60,8 @@
569 $${TOP_SRC_DIR}/lib/plugins \
570 $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common \
571 $${TOP_SRC_DIR}/lib/signond \
572- $${TOP_SRC_DIR}/lib/sim-dlc
573+ $${TOP_SRC_DIR}/lib/sim-dlc \
574+ $${TOP_SRC_DIR}/lib
575
576 CONFIG += build_all \
577 link_pkgconfig
578
579=== modified file 'tests/libsignon-qt-tests/libsignon-qt-tests.pro'
580--- tests/libsignon-qt-tests/libsignon-qt-tests.pro 2013-08-20 08:01:44 +0000
581+++ tests/libsignon-qt-tests/libsignon-qt-tests.pro 2015-11-04 07:28:42 +0000
582@@ -16,6 +16,7 @@
583 } else {
584 LIBS *= -lsignon-qt
585 }
586+QMAKE_LIBDIR += $${TOP_BUILD_DIR}/lib/SignOn
587 QMAKE_RPATHDIR = $${QMAKE_LIBDIR}
588
589 SOURCES += \
590@@ -34,6 +35,7 @@
591 testidentityresult.h \
592 $$TOP_SRC_DIR/src/plugins/test/ssotest2data.h
593 INCLUDEPATH += . \
594+ $$TOP_SRC_DIR/lib \
595 $$TOP_SRC_DIR/lib/plugins \
596 $$TOP_SRC_DIR/src/plugins/test
597 DEFINES += SSO_CI_TESTMANAGEMENT
598
599=== modified file 'tests/passwordplugintest/passwordplugintest.pro'
600--- tests/passwordplugintest/passwordplugintest.pro 2012-11-05 09:30:27 +0000
601+++ tests/passwordplugintest/passwordplugintest.pro 2015-11-04 07:28:42 +0000
602@@ -16,7 +16,8 @@
603
604 INCLUDEPATH += $${TOP_SRC_DIR}/lib/plugins \
605 $${TOP_SRC_DIR}/src/plugins/password \
606- $${TOP_SRC_DIR}/src/plugins
607+ $${TOP_SRC_DIR}/src/plugins \
608+ $${TOP_SRC_DIR}/lib
609
610 QMAKE_CXXFLAGS += -fno-exceptions \
611 -fno-rtti
612
613=== modified file 'tests/signond-tests/identity-tool.pro'
614--- tests/signond-tests/identity-tool.pro 2013-08-20 08:01:44 +0000
615+++ tests/signond-tests/identity-tool.pro 2015-11-04 07:28:42 +0000
616@@ -13,7 +13,8 @@
617 }
618
619 QMAKE_LIBDIR += \
620- $${TOP_BUILD_DIR}/lib/signond/SignOn
621+ $${TOP_BUILD_DIR}/lib/signond/SignOn \
622+ $${TOP_BUILD_DIR}/lib/SignOn
623 QMAKE_RPATHDIR = $${QMAKE_LIBDIR}
624
625 INCLUDEPATH += \
626
627=== modified file 'tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro'
628--- tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro 2013-08-20 08:01:44 +0000
629+++ tests/signond-tests/mock-ac-plugin/identity-ac-helper.pro 2015-11-04 07:28:42 +0000
630@@ -13,7 +13,8 @@
631 }
632
633 QMAKE_LIBDIR += \
634- $${TOP_BUILD_DIR}/lib/signond/SignOn
635+ $${TOP_BUILD_DIR}/lib/signond/SignOn \
636+ $${TOP_BUILD_DIR}/lib/SignOn
637 QMAKE_RPATHDIR = $${QMAKE_LIBDIR}
638
639 INCLUDEPATH += \
640
641=== modified file 'tests/signond-tests/signond-tests.pri'
642--- tests/signond-tests/signond-tests.pri 2014-11-17 09:59:40 +0000
643+++ tests/signond-tests/signond-tests.pri 2015-11-04 07:28:42 +0000
644@@ -20,7 +20,8 @@
645 }
646
647 QMAKE_LIBDIR += \
648- $${TOP_BUILD_DIR}/lib/signond/SignOn
649+ $${TOP_BUILD_DIR}/lib/signond/SignOn \
650+ $${TOP_BUILD_DIR}/lib/SignOn
651 QMAKE_RPATHDIR = $${QMAKE_LIBDIR}
652
653 SIGNOND_SRC = $${TOP_SRC_DIR}/src/signond
654@@ -33,7 +34,8 @@
655 $$TOP_SRC_DIR/lib/signond \
656 $$TOP_SRC_DIR/src/signond \
657 $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common \
658- $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common/SignOn
659+ $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common/SignOn \
660+ $${TOP_SRC_DIR}/lib \
661
662 QMAKE_CXXFLAGS += -fno-exceptions \
663 -fno-rtti

Subscribers

No one subscribed via source and target branches