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

Merge remote-tracking branch 'qt/5.9' into dev

Browse Source 
Change-Id: I286b58e2c3a42c1078fd25d5b699c8a17edb1c23
This commit is contained in:
Paul Olav Tvete 2017-06-27 14:17:37 +02:00
commit 636ce8d733
9 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp
View File

@ -84,10 +84,10 @@ QWaylandClientBufferIntegration *QWaylandClientBufferIntegrationFactory::create(
// Try loading the plugin from platformPluginPath first: // Try loading the plugin from platformPluginPath first:
if (!pluginPath.isEmpty()) { if (!pluginPath.isEmpty()) {
QCoreApplication::addLibraryPath(pluginPath); QCoreApplication::addLibraryPath(pluginPath);
if (QWaylandClientBufferIntegration *ret = qLoadPlugin1<QWaylandClientBufferIntegration, QWaylandClientBufferIntegrationPlugin>(directLoader(), name, args)) if (QWaylandClientBufferIntegration *ret = qLoadPlugin<QWaylandClientBufferIntegration, QWaylandClientBufferIntegrationPlugin>(directLoader(), name, args))
return ret; return ret;
} }
if (QWaylandClientBufferIntegration *ret = qLoadPlugin1<QWaylandClientBufferIntegration, QWaylandClientBufferIntegrationPlugin>(loader(), name, args)) if (QWaylandClientBufferIntegration *ret = qLoadPlugin<QWaylandClientBufferIntegration, QWaylandClientBufferIntegrationPlugin>(loader(), name, args))
return ret; return ret;
#endif #endif
return 0; return 0;

4
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp
View File

@ -84,10 +84,10 @@ QWaylandServerBufferIntegration *QWaylandServerBufferIntegrationFactory::create(
// Try loading the plugin from platformPluginPath first: // Try loading the plugin from platformPluginPath first:
if (!pluginPath.isEmpty()) { if (!pluginPath.isEmpty()) {
QCoreApplication::addLibraryPath(pluginPath); QCoreApplication::addLibraryPath(pluginPath);
if (QWaylandServerBufferIntegration *ret = qLoadPlugin1<QWaylandServerBufferIntegration, QWaylandServerBufferIntegrationPlugin>(directLoader(), name, args)) if (QWaylandServerBufferIntegration *ret = qLoadPlugin<QWaylandServerBufferIntegration, QWaylandServerBufferIntegrationPlugin>(directLoader(), name, args))
return ret; return ret;
} }
if (QWaylandServerBufferIntegration *ret = qLoadPlugin1<QWaylandServerBufferIntegration, QWaylandServerBufferIntegrationPlugin>(loader(), name, args)) if (QWaylandServerBufferIntegration *ret = qLoadPlugin<QWaylandServerBufferIntegration, QWaylandServerBufferIntegrationPlugin>(loader(), name, args))
return ret; return ret;
#endif #endif
return 0; return 0;

4
src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp
View File

@ -84,10 +84,10 @@ QWaylandInputDeviceIntegration *QWaylandInputDeviceIntegrationFactory::create(co
// Try loading the plugin from platformPluginPath first: // Try loading the plugin from platformPluginPath first:
if (!pluginPath.isEmpty()) { if (!pluginPath.isEmpty()) {
QCoreApplication::addLibraryPath(pluginPath); QCoreApplication::addLibraryPath(pluginPath);
if (QWaylandInputDeviceIntegration *ret = qLoadPlugin1<QWaylandInputDeviceIntegration, QWaylandInputDeviceIntegrationPlugin>(directLoader(), name, args)) if (QWaylandInputDeviceIntegration *ret = qLoadPlugin<QWaylandInputDeviceIntegration, QWaylandInputDeviceIntegrationPlugin>(directLoader(), name, args))
return ret; return ret;
} }
if (QWaylandInputDeviceIntegration *ret = qLoadPlugin1<QWaylandInputDeviceIntegration, QWaylandInputDeviceIntegrationPlugin>(loader(), name, args)) if (QWaylandInputDeviceIntegration *ret = qLoadPlugin<QWaylandInputDeviceIntegration, QWaylandInputDeviceIntegrationPlugin>(loader(), name, args))
return ret; return ret;
#endif #endif
return Q_NULLPTR; return Q_NULLPTR;

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

@ -84,10 +84,10 @@ QWaylandAbstractDecoration *QWaylandDecorationFactory::create(const QString &nam
// Try loading the plugin from platformPluginPath first: // Try loading the plugin from platformPluginPath first:
if (!pluginPath.isEmpty()) { if (!pluginPath.isEmpty()) {
QCoreApplication::addLibraryPath(pluginPath); QCoreApplication::addLibraryPath(pluginPath);
if (QWaylandAbstractDecoration *ret = qLoadPlugin1<QWaylandAbstractDecoration, QWaylandDecorationPlugin>(directLoader(), name, args)) if (QWaylandAbstractDecoration *ret = qLoadPlugin<QWaylandAbstractDecoration, QWaylandDecorationPlugin>(directLoader(), name, args))
return ret; return ret;
} }
if (QWaylandAbstractDecoration *ret = qLoadPlugin1<QWaylandAbstractDecoration, QWaylandDecorationPlugin>(loader(), name, args)) if (QWaylandAbstractDecoration *ret = qLoadPlugin<QWaylandAbstractDecoration, QWaylandDecorationPlugin>(loader(), name, args))
return ret; return ret;
#endif #endif

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

@ -171,12 +171,20 @@ QPaintDevice *QWaylandShmBackingStore::paintDevice()
return contentSurface(); return contentSurface();
} }
void QWaylandShmBackingStore::beginPaint(const QRegion &) void QWaylandShmBackingStore::beginPaint(const QRegion &region)
{ {
mPainting = true; mPainting = true;
ensureSize(); ensureSize();
waylandWindow()->setCanResize(false); waylandWindow()->setCanResize(false);
if (mBackBuffer->image()->hasAlphaChannel()) {
QPainter p(paintDevice());
p.setCompositionMode(QPainter::CompositionMode_Source);
const QColor blank = Qt::transparent;
for (const QRect &rect : region)
p.fillRect(rect, blank);
}
} }
void QWaylandShmBackingStore::endPaint() void QWaylandShmBackingStore::endPaint()

2
src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h
View File

@ -94,7 +94,7 @@ public:
void flush(QWindow *window, const QRegion &region, const QPoint &offset) override; void flush(QWindow *window, const QRegion &region, const QPoint &offset) override;
void resize(const QSize &size, const QRegion &staticContents) override; void resize(const QSize &size, const QRegion &staticContents) override;
void resize(const QSize &size); void resize(const QSize &size);
void beginPaint(const QRegion &) override; void beginPaint(const QRegion &region) override;
void endPaint() override; void endPaint() override;
QWaylandAbstractDecoration *windowDecoration() const; QWaylandAbstractDecoration *windowDecoration() const;

1
src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.cpp
View File

@ -108,6 +108,7 @@ void QWaylandInputMethodEventBuilder::addPreeditStyling(uint32_t index, uint32_t
format.setFontUnderline(true); format.setFontUnderline(true);
format.setUnderlineStyle(QTextCharFormat::SingleUnderline); format.setUnderlineStyle(QTextCharFormat::SingleUnderline);
m_preeditStyles.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, index, length, format)); m_preeditStyles.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, index, length, format));
break;
case 5: case 5:
format.setFontUnderline(true); format.setFontUnderline(true);
format.setUnderlineStyle(QTextCharFormat::WaveUnderline); format.setUnderlineStyle(QTextCharFormat::WaveUnderline);

4
src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory.cpp
View File

@ -84,10 +84,10 @@ QWaylandShellIntegration *QWaylandShellIntegrationFactory::create(const QString
// Try loading the plugin from platformPluginPath first: // Try loading the plugin from platformPluginPath first:
if (!pluginPath.isEmpty()) { if (!pluginPath.isEmpty()) {
QCoreApplication::addLibraryPath(pluginPath); QCoreApplication::addLibraryPath(pluginPath);
if (QWaylandShellIntegration *ret = qLoadPlugin1<QWaylandShellIntegration, QWaylandShellIntegrationPlugin>(directLoader(), name, args)) if (QWaylandShellIntegration *ret = qLoadPlugin<QWaylandShellIntegration, QWaylandShellIntegrationPlugin>(directLoader(), name, args))
return ret; return ret;
} }
if (QWaylandShellIntegration *ret = qLoadPlugin1<QWaylandShellIntegration, QWaylandShellIntegrationPlugin>(loader(), name, args)) if (QWaylandShellIntegration *ret = qLoadPlugin<QWaylandShellIntegration, QWaylandShellIntegrationPlugin>(loader(), name, args))
return ret; return ret;
#endif #endif
return Q_NULLPTR; return Q_NULLPTR;

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

@ -392,6 +392,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("\n"); printf("\n");
printf("QT_BEGIN_NAMESPACE\n"); printf("QT_BEGIN_NAMESPACE\n");
printf("QT_WARNING_PUSH\n");
printf("QT_WARNING_DISABLE_GCC(\"-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";
@ -533,6 +535,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("}\n"); printf("}\n");
printf("\n"); printf("\n");
printf("QT_WARNING_POP\n");
printf("QT_END_NAMESPACE\n"); printf("QT_END_NAMESPACE\n");
printf("\n"); printf("\n");
printf("#endif\n"); printf("#endif\n");
@ -545,6 +548,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("#include <%s/qwayland-server-%s.h>\n", headerPath.constData(), QByteArray(protocolName).replace('_', '-').constData()); printf("#include <%s/qwayland-server-%s.h>\n", headerPath.constData(), QByteArray(protocolName).replace('_', '-').constData());
printf("\n"); printf("\n");
printf("QT_BEGIN_NAMESPACE\n"); printf("QT_BEGIN_NAMESPACE\n");
printf("QT_WARNING_PUSH\n");
printf("QT_WARNING_DISABLE_GCC(\"-Wmissing-field-initializers\")\n");
printf("\n"); printf("\n");
printf("namespace QtWaylandServer {\n"); printf("namespace QtWaylandServer {\n");
@ -827,6 +832,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
} }
printf("}\n"); printf("}\n");
printf("\n"); printf("\n");
printf("QT_WARNING_POP\n");
printf("QT_END_NAMESPACE\n"); printf("QT_END_NAMESPACE\n");
} }
@ -843,6 +849,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("#include <QString>\n"); printf("#include <QString>\n");
printf("\n"); printf("\n");
printf("QT_BEGIN_NAMESPACE\n"); printf("QT_BEGIN_NAMESPACE\n");
printf("QT_WARNING_PUSH\n");
printf("QT_WARNING_DISABLE_GCC(\"-Wmissing-field-initializers\")\n");
QByteArray clientExport; QByteArray clientExport;
@ -940,6 +948,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
} }
printf("}\n"); printf("}\n");
printf("\n"); printf("\n");
printf("QT_WARNING_POP\n");
printf("QT_END_NAMESPACE\n"); printf("QT_END_NAMESPACE\n");
printf("\n"); printf("\n");
printf("#endif\n"); printf("#endif\n");
@ -952,6 +961,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf("#include <%s/qwayland-%s.h>\n", headerPath.constData(), QByteArray(protocolName).replace('_', '-').constData()); printf("#include <%s/qwayland-%s.h>\n", headerPath.constData(), QByteArray(protocolName).replace('_', '-').constData());
printf("\n"); printf("\n");
printf("QT_BEGIN_NAMESPACE\n"); printf("QT_BEGIN_NAMESPACE\n");
printf("QT_WARNING_PUSH\n");
printf("QT_WARNING_DISABLE_GCC(\"-Wmissing-field-initializers\")\n");
printf("\n"); printf("\n");
printf("namespace QtWayland {\n"); printf("namespace QtWayland {\n");
for (int j = 0; j < interfaces.size(); ++j) { for (int j = 0; j < interfaces.size(); ++j) {
@ -1134,6 +1145,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
} }
printf("}\n"); printf("}\n");
printf("\n"); printf("\n");
printf("QT_WARNING_POP\n");
printf("QT_END_NAMESPACE\n"); printf("QT_END_NAMESPACE\n");
} }
} }