diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2016-09-22 16:23:20 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2016-09-23 08:57:54 +0000 |
| commit | c8cda60d49adb562405794ab5ac496c2fd01e1e3 (patch) | |
| tree | 4219948d4307f0866e93ff526802f946d5bf7470 | |
| parent | a132c64b5d590516869a252a4a6fc823787c4b61 (diff) | |
Rename test/ folder to tests/ to comply with CI
Also change the install targets to be under QT_INSTALL_BINS and
QT_INSTALL_LIBS.
Task-number: QTBUG-56066
Change-Id: Icaf309ebb6e62bbf35df09fd6a72795f64f6f041
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | client/client.pro | 2 | ||||
| -rw-r--r-- | libqdb/libqdb.pro | 2 | ||||
| -rw-r--r-- | qdb.pro | 4 | ||||
| -rw-r--r-- | qdbd/qdbd.pro | 2 | ||||
| -rw-r--r-- | tests/servicetest.cpp (renamed from test/servicetest.cpp) | 0 | ||||
| -rw-r--r-- | tests/servicetest.pro (renamed from test/servicetest.pro) | 0 | ||||
| -rw-r--r-- | tests/streamtest.cpp (renamed from test/streamtest.cpp) | 0 | ||||
| -rw-r--r-- | tests/streamtest.pro (renamed from test/streamtest.pro) | 0 | ||||
| -rw-r--r-- | tests/tests.pro (renamed from test/test.pro) | 0 | ||||
| -rw-r--r-- | tests/tst_qdbmessage.cpp (renamed from test/tst_qdbmessage.cpp) | 0 | ||||
| -rw-r--r-- | tests/tst_qdbmessage.pro (renamed from test/tst_qdbmessage.pro) | 0 | ||||
| -rw-r--r-- | tests/tst_stream.cpp (renamed from test/tst_stream.cpp) | 0 | ||||
| -rw-r--r-- | tests/tst_stream.pro (renamed from test/tst_stream.pro) | 0 |
13 files changed, 5 insertions, 5 deletions
diff --git a/client/client.pro b/client/client.pro index 3272d24..3ea5839 100644 --- a/client/client.pro +++ b/client/client.pro @@ -35,7 +35,7 @@ INCLUDEPATH += $$PWD/../libqdb unix { LIBS = -L$$OUT_PWD/../libqdb -lqdb QMAKE_RPATHDIR += ../libqdb - target.path = /usr/bin + target.path = $$[QT_INSTALL_BINS] INSTALLS += target } diff --git a/libqdb/libqdb.pro b/libqdb/libqdb.pro index eb1e302..ec5fadf 100644 --- a/libqdb/libqdb.pro +++ b/libqdb/libqdb.pro @@ -40,7 +40,7 @@ HEADERS += \ interruptsignalhandler.h \ unix { - target.path = /usr/lib + target.path = $$[QT_INSTALL_LIBS] INSTALLS += target } @@ -6,10 +6,10 @@ load(configure) SUBDIRS += \ libqdb \ client \ - test + tests client.depends += libqdb -test.depends += libqdb +tests.depends += libqdb unix { SUBDIRS += \ diff --git a/qdbd/qdbd.pro b/qdbd/qdbd.pro index 39137a8..d92e05e 100644 --- a/qdbd/qdbd.pro +++ b/qdbd/qdbd.pro @@ -43,6 +43,6 @@ LIBS = -L$$OUT_PWD/../libqdb -lqdb QMAKE_RPATHDIR += ../libqdb unix { - target.path = /usr/bin + target.path = $$[QT_INSTALL_BINS] INSTALLS += target } diff --git a/test/servicetest.cpp b/tests/servicetest.cpp index c87d429..c87d429 100644 --- a/test/servicetest.cpp +++ b/tests/servicetest.cpp diff --git a/test/servicetest.pro b/tests/servicetest.pro index a5914f8..a5914f8 100644 --- a/test/servicetest.pro +++ b/tests/servicetest.pro diff --git a/test/streamtest.cpp b/tests/streamtest.cpp index df0c814..df0c814 100644 --- a/test/streamtest.cpp +++ b/tests/streamtest.cpp diff --git a/test/streamtest.pro b/tests/streamtest.pro index 6ff8223..6ff8223 100644 --- a/test/streamtest.pro +++ b/tests/streamtest.pro diff --git a/test/test.pro b/tests/tests.pro index 28b6fad..28b6fad 100644 --- a/test/test.pro +++ b/tests/tests.pro diff --git a/test/tst_qdbmessage.cpp b/tests/tst_qdbmessage.cpp index 121d65d..121d65d 100644 --- a/test/tst_qdbmessage.cpp +++ b/tests/tst_qdbmessage.cpp diff --git a/test/tst_qdbmessage.pro b/tests/tst_qdbmessage.pro index 180f616..180f616 100644 --- a/test/tst_qdbmessage.pro +++ b/tests/tst_qdbmessage.pro diff --git a/test/tst_stream.cpp b/tests/tst_stream.cpp index 8bdace1..8bdace1 100644 --- a/test/tst_stream.cpp +++ b/tests/tst_stream.cpp diff --git a/test/tst_stream.pro b/tests/tst_stream.pro index fb690f5..fb690f5 100644 --- a/test/tst_stream.pro +++ b/tests/tst_stream.pro |