1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.11' into dev

Browse Source 
Change-Id: I8a1570eac9bbe418283522624002f8a03dd60c95
This commit is contained in:
Qt Forward Merge Bot 2018-05-26 03:00:15 +02:00
commit f9da2c645c
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
View File

@ -59,7 +59,9 @@
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
# include <sys/syscall.h> # include <sys/syscall.h>
// from linux/memfd.h: // from linux/memfd.h:
# define MFD_CLOEXEC 0x0001U # ifndef MFD_CLOEXEC
# define MFD_CLOEXEC 0x0001U
# endif
#endif #endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

1
src/tools/qtwaylandscanner/qtwaylandscanner.cpp
View File

@ -394,6 +394,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("QT_BEGIN_NAMESPACE\n"); printf("QT_BEGIN_NAMESPACE\n");
printf("QT_WARNING_PUSH\n"); printf("QT_WARNING_PUSH\n");
printf("QT_WARNING_DISABLE_GCC(\"-Wmissing-field-initializers\")\n"); printf("QT_WARNING_DISABLE_GCC(\"-Wmissing-field-initializers\")\n");
printf("QT_WARNING_DISABLE_CLANG(\"-Wmissing-field-initializers\")\n");
QByteArray serverExport; QByteArray serverExport;
if (headerPath.size()) { if (headerPath.size()) {
serverExport = QByteArray("Q_WAYLAND_SERVER_") + preProcessorProtocolName + "_EXPORT"; serverExport = QByteArray("Q_WAYLAND_SERVER_") + preProcessorProtocolName + "_EXPORT";

8
tests/auto/wayland/client/tst_client.cpp
View File

@ -264,9 +264,6 @@ void tst_WaylandClient::windowScreens()
compositor->sendRemoveOutput(secondOutput); compositor->sendRemoveOutput(secondOutput);
QTRY_COMPARE(QGuiApplication::screens().size(), 1); QTRY_COMPARE(QGuiApplication::screens().size(), 1);
QCOMPARE(window.screen(), primaryScreen); QCOMPARE(window.screen(), primaryScreen);
window.destroy();
QTRY_VERIFY(!compositor->surface());
} }
void tst_WaylandClient::removePrimaryScreen() void tst_WaylandClient::removePrimaryScreen()
@ -298,9 +295,6 @@ void tst_WaylandClient::removePrimaryScreen()
QTRY_COMPARE(window.mousePressEventCount, 1); QTRY_COMPARE(window.mousePressEventCount, 1);
compositor->sendMouseRelease(surface); compositor->sendMouseRelease(surface);
QTRY_COMPARE(window.mouseReleaseEventCount, 1); QTRY_COMPARE(window.mouseReleaseEventCount, 1);
window.destroy();
QTRY_VERIFY(!compositor->surface());
} }
void tst_WaylandClient::createDestroyWindow() void tst_WaylandClient::createDestroyWindow()
@ -532,8 +526,6 @@ void tst_WaylandClient::dontCrashOnMultipleCommits()
} }
delete window; delete window;
QTRY_VERIFY(!compositor->surface());
} }
void tst_WaylandClient::hiddenTransientParent() void tst_WaylandClient::hiddenTransientParent()