diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:45:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:54:01 +0200 |
| commit | 77da617dc8e378a631ee8c15b1b414f16b87f147 (patch) | |
| tree | 563f4f8e64e416774ea2b1599b896b589385168c /tests/auto/dbus | |
| parent | c17134e2db4d364855aa78a0d3c47cb9ef964dd9 (diff) | |
| parent | 01f3530650f9f6f4c08520263a3c62281d81e3fc (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/3rdparty/forkfd/forkfd.c
src/corelib/codecs/qtextcodec.cpp
src/corelib/kernel/qmetatype.cpp
src/corelib/tools/qset.qdoc
src/gui/accessible/qaccessible.cpp
src/gui/image/qpixmapcache.cpp
src/opengl/qgl.cpp
src/tools/qdoc/generator.cpp
src/widgets/kernel/qwidget.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
Diffstat (limited to 'tests/auto/dbus')
| -rw-r--r-- | tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro | 2 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/qdbusabstractadaptor.pro (renamed from tests/auto/dbus/qdbusabstractadaptor/test/test.pro) | 0 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro | 2 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/qdbusabstractinterface.pro (renamed from tests/auto/dbus/qdbusabstractinterface/test/test.pro) | 0 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusinterface/qdbusinterface.pro | 2 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusinterface/qdbusinterface/qdbusinterface.pro (renamed from tests/auto/dbus/qdbusinterface/test/test.pro) | 0 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro | 2 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro (renamed from tests/auto/dbus/qdbusmarshall/test/test.pro) | 0 |
8 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro index d67d81e4bf..1b35019f94 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro +++ b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro @@ -3,4 +3,4 @@ TARGET = tst_qdbusabstractadaptor QT = core core-private testlib TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = qmyserver test +SUBDIRS = qmyserver qdbusabstractadaptor diff --git a/tests/auto/dbus/qdbusabstractadaptor/test/test.pro b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/qdbusabstractadaptor.pro index d95fa941f0..d95fa941f0 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/test/test.pro +++ b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/qdbusabstractadaptor.pro diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro index 623b07fcbd..99462b1b36 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro @@ -2,5 +2,5 @@ CONFIG += testcase TARGET = tst_qdbusabstractinterface TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = qpinger test +SUBDIRS = qpinger qdbusabstractinterface OTHER_FILES += org.qtproject.QtDBus.Pinger.xml diff --git a/tests/auto/dbus/qdbusabstractinterface/test/test.pro b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/qdbusabstractinterface.pro index a8cc4c2b38..a8cc4c2b38 100644 --- a/tests/auto/dbus/qdbusabstractinterface/test/test.pro +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/qdbusabstractinterface.pro diff --git a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro index 093a888765..c8861cb2a4 100644 --- a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro +++ b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro @@ -3,4 +3,4 @@ TARGET = tst_qdbusinterface QT = core testlib TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = qmyserver test +SUBDIRS = qmyserver qdbusinterface diff --git a/tests/auto/dbus/qdbusinterface/test/test.pro b/tests/auto/dbus/qdbusinterface/qdbusinterface/qdbusinterface.pro index 170b555ee7..170b555ee7 100644 --- a/tests/auto/dbus/qdbusinterface/test/test.pro +++ b/tests/auto/dbus/qdbusinterface/qdbusinterface/qdbusinterface.pro diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro index dfbb206324..e9a41c0fb4 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdbusmarshall TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = qpong test +SUBDIRS = qpong qdbusmarshall QT = core-private testlib diff --git a/tests/auto/dbus/qdbusmarshall/test/test.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro index b0656231d2..b0656231d2 100644 --- a/tests/auto/dbus/qdbusmarshall/test/test.pro +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro |