60 lines
1.6 KiB
Diff
60 lines
1.6 KiB
Diff
From: Yuqing Zhu <carol.zhu@nxp.com>
|
|
Date: Tue, 8 Jan 2019 17:51:59 +0800
|
|
Subject: [PATCH] tst_client.cpp: Fix no-opengl build error
|
|
|
|
The error is introduced by bf09c7a1493c01a65ee0f110b37a04e653edc08e
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
|
|
---
|
|
tests/auto/client/client/tst_client.cpp | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
Index: git/tests/auto/client/client/tst_client.cpp
|
|
===================================================================
|
|
--- git.orig/tests/auto/client/client/tst_client.cpp
|
|
+++ git/tests/auto/client/client/tst_client.cpp
|
|
@@ -107,6 +107,7 @@ public:
|
|
QPoint mousePressPos;
|
|
};
|
|
|
|
+#ifndef QT_NO_OPENGL
|
|
class TestGlWindow : public QOpenGLWindow
|
|
{
|
|
Q_OBJECT
|
|
@@ -136,6 +137,7 @@ void TestGlWindow::paintGL()
|
|
glClear(GL_COLOR_BUFFER_BIT);
|
|
++paintGLCalled;
|
|
}
|
|
+#endif // QT_NO_OPENGL
|
|
|
|
class tst_WaylandClient : public QObject
|
|
{
|
|
@@ -176,7 +178,9 @@ private slots:
|
|
void dontCrashOnMultipleCommits();
|
|
void hiddenTransientParent();
|
|
void hiddenPopupParent();
|
|
+#ifndef QT_NO_OPENGL
|
|
void glWindow();
|
|
+#endif // QT_NO_OPENGL
|
|
void longWindowTitle();
|
|
void longWindowTitleWithUtf16Characters();
|
|
|
|
@@ -459,6 +463,7 @@ void tst_WaylandClient::hiddenPopupParen
|
|
QTRY_VERIFY(compositor->surface());
|
|
}
|
|
|
|
+#ifndef QT_NO_OPENGL
|
|
void tst_WaylandClient::glWindow()
|
|
{
|
|
QSKIP("Skipping GL tests, as not supported by all CI systems: See https://bugreports.qt.io/browse/QTBUG-65802");
|
|
@@ -484,6 +489,7 @@ void tst_WaylandClient::glWindow()
|
|
testWindow->setVisible(false);
|
|
QTRY_VERIFY(!compositor->surface());
|
|
}
|
|
+#endif // QT_NO_OPENGL
|
|
|
|
void tst_WaylandClient::longWindowTitle()
|
|
{
|