diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-23 08:01:14 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-08-23 12:28:25 +0200 |
commit | 6b7a94b56aa4c3ce21ecf093baba03f0cd7582ed (patch) | |
tree | 455596965d022c63d2c21ca615babf92c9ec74cf /tests/auto/client | |
parent | 625f257e4857dd21653fccf0e7dd4010a60bc45d (diff) | |
parent | 2cc758045e322873ad58f675a70c8d8366b5c318 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/compositor/compositor.pro
tests/auto/compositor/compositor/compositor.pro
Change-Id: Id9f3cf97ca3b600bdafba846908643ff0f8964b9
Diffstat (limited to 'tests/auto/client')
-rw-r--r-- | tests/auto/client/client.pro | 26 | ||||
-rw-r--r-- | tests/auto/client/client/client.pro | 28 | ||||
-rw-r--r-- | tests/auto/client/client/mockcompositor.cpp (renamed from tests/auto/client/mockcompositor.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/client/client/mockcompositor.h (renamed from tests/auto/client/mockcompositor.h) | 0 | ||||
-rw-r--r-- | tests/auto/client/client/mockinput.cpp (renamed from tests/auto/client/mockinput.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/client/client/mockinput.h (renamed from tests/auto/client/mockinput.h) | 0 | ||||
-rw-r--r-- | tests/auto/client/client/mockoutput.cpp (renamed from tests/auto/client/mockoutput.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/client/client/mockshell.cpp (renamed from tests/auto/client/mockshell.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/client/client/mocksurface.cpp (renamed from tests/auto/client/mocksurface.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/client/client/mocksurface.h (renamed from tests/auto/client/mocksurface.h) | 0 | ||||
-rw-r--r-- | tests/auto/client/client/tst_client.cpp (renamed from tests/auto/client/tst_client.cpp) | 0 |
11 files changed, 30 insertions, 24 deletions
diff --git a/tests/auto/client/client.pro b/tests/auto/client/client.pro index eaf6c6e95..916b3abe4 100644 --- a/tests/auto/client/client.pro +++ b/tests/auto/client/client.pro @@ -1,25 +1,3 @@ -CONFIG += testcase link_pkgconfig -TARGET = tst_client +TEMPLATE=subdirs -QT += testlib -QT += core-private gui-private - -!contains(QT_CONFIG, no-pkg-config) { - PKGCONFIG += wayland-client wayland-server -} else { - LIBS += -lwayland-client -lwayland-server -} - -CONFIG += wayland-scanner -WAYLANDSERVERSOURCES += \ - ../../../src/3rdparty/protocol/wayland.xml - -SOURCES += tst_client.cpp \ - mockcompositor.cpp \ - mockinput.cpp \ - mockshell.cpp \ - mocksurface.cpp \ - mockoutput.cpp -HEADERS += mockcompositor.h \ - mockinput.h \ - mocksurface.h \ +SUBDIRS += client diff --git a/tests/auto/client/client/client.pro b/tests/auto/client/client/client.pro new file mode 100644 index 000000000..006d130a0 --- /dev/null +++ b/tests/auto/client/client/client.pro @@ -0,0 +1,28 @@ +CONFIG += testcase link_pkgconfig +TARGET = tst_client + +QT += testlib +QT += core-private gui-private + +!contains(QT_CONFIG, no-pkg-config) { + PKGCONFIG += wayland-client wayland-server +} else { + LIBS += -lwayland-client -lwayland-server +} + +CONFIG += wayland-scanner +WAYLANDSERVERSOURCES += \ + ../../../../src/3rdparty/protocol/wayland.xml + +SOURCES += \ + tst_client.cpp \ + mockcompositor.cpp \ + mockinput.cpp \ + mockshell.cpp \ + mocksurface.cpp \ + mockoutput.cpp + +HEADERS += \ + mockcompositor.h \ + mockinput.h \ + mocksurface.h diff --git a/tests/auto/client/mockcompositor.cpp b/tests/auto/client/client/mockcompositor.cpp index c00d24bc3..c00d24bc3 100644 --- a/tests/auto/client/mockcompositor.cpp +++ b/tests/auto/client/client/mockcompositor.cpp diff --git a/tests/auto/client/mockcompositor.h b/tests/auto/client/client/mockcompositor.h index dd6450fc9..dd6450fc9 100644 --- a/tests/auto/client/mockcompositor.h +++ b/tests/auto/client/client/mockcompositor.h diff --git a/tests/auto/client/mockinput.cpp b/tests/auto/client/client/mockinput.cpp index fe06bf79b..fe06bf79b 100644 --- a/tests/auto/client/mockinput.cpp +++ b/tests/auto/client/client/mockinput.cpp diff --git a/tests/auto/client/mockinput.h b/tests/auto/client/client/mockinput.h index 031be2a4a..031be2a4a 100644 --- a/tests/auto/client/mockinput.h +++ b/tests/auto/client/client/mockinput.h diff --git a/tests/auto/client/mockoutput.cpp b/tests/auto/client/client/mockoutput.cpp index 057387160..057387160 100644 --- a/tests/auto/client/mockoutput.cpp +++ b/tests/auto/client/client/mockoutput.cpp diff --git a/tests/auto/client/mockshell.cpp b/tests/auto/client/client/mockshell.cpp index 2ce5965a3..2ce5965a3 100644 --- a/tests/auto/client/mockshell.cpp +++ b/tests/auto/client/client/mockshell.cpp diff --git a/tests/auto/client/mocksurface.cpp b/tests/auto/client/client/mocksurface.cpp index 749a1470d..749a1470d 100644 --- a/tests/auto/client/mocksurface.cpp +++ b/tests/auto/client/client/mocksurface.cpp diff --git a/tests/auto/client/mocksurface.h b/tests/auto/client/client/mocksurface.h index d04386ac8..d04386ac8 100644 --- a/tests/auto/client/mocksurface.h +++ b/tests/auto/client/client/mocksurface.h diff --git a/tests/auto/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp index 74363ef5f..74363ef5f 100644 --- a/tests/auto/client/tst_client.cpp +++ b/tests/auto/client/client/tst_client.cpp |