Merge remote branch 'gerrit/master' into refactor

Conflicts:
	src/gui/image/qicon.cpp
	src/gui/image/qicon.h
	src/gui/image/qicon_p.h
	src/gui/text/qfontdatabase.cpp
	src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
	src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
	sync.profile

Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4

diff --cc examples/embedded/embedded.pro
Simple merge

diff --cc examples/embedded/styleexample/styleexample.pro
index e8a4281,70942fd..5b1273e
--- 1/examples/embedded/styledemo/styledemo.pro
--- 2/examples/embedded/styleexample/styleexample.pro
+++ b/examples/embedded/styleexample/styleexample.pro
@@@ -13,6 -13,5 +13,6 @@@ INSTALLS += target source
  
  symbian {
      TARGET.UID3 = 0xA000A63F
-     CONFIG += qt_demo
+     CONFIG += qt_example
  }
 +QT += widgets widgets

diff --cc examples/graphicsview/chip/mainwindow.cpp
Simple merge

diff --cc examples/graphicsview/embeddeddialogs/main.cpp
Simple merge

diff --cc qmake/qmake.pri
Simple merge

diff --cc src/corelib/global/qglobal.h
index af9d86c,1358ea6..844fe05
--- 1/src/corelib/global/qglobal.h
--- 2/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@@ -1091,9 -1129,15 +1114,15 @@@ redefine to built-in booleans to make a
  #  define QT_FASTCALL
  #endif
  
+ #ifdef Q_COMPILER_CONSTEXPR
+ # define Q_DECL_CONSTEXPR constexpr
+ #else
+ # define Q_DECL_CONSTEXPR
+ #endif
+ 
  //defines the type for the WNDPROC on windows
  //the alignment needs to be forced for sse2 to not crash with mingw
 -#if defined(Q_WS_WIN)
 +#if defined(Q_OS_WIN)
  #  if defined(Q_CC_MINGW)
  #    define QT_ENSURE_STACK_ALIGNED_FOR_SSE __attribute__ ((force_align_arg_pointer))
  #  else

diff --cc src/corelib/kernel/qcoreapplication.cpp
Simple merge

diff --cc src/corelib/kernel/qobject.cpp
Simple merge

diff --cc src/gui/painting/qpainter.cpp
Simple merge

diff --cc src/gui/text/qfontdatabase.cpp
index 98b43d5,d4e3cc2..655042a
--- 1/src/gui/text/qfontdatabase.cpp
--- 2/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@@ -2026,20 -2037,16 +2037,16 @@@ QFont QFontDatabase::font(const QStrin
      }
  
      QtFontStyle::Key styleKey(style);
-     QtFontStyle *s = bestStyle(&allStyles, styleKey);
+     QtFontStyle *s = bestStyle(&allStyles, styleKey, style);
  
      if (!s) // no styles found?
 -        return QApplication::font();
 +        return QGuiApplication::font();
-     if (s->key.styleName.isEmpty()) {
-         QFont fnt(family, pointSize, s->key.weight);
-         fnt.setStyle((QFont::Style)s->key.style);
-         return fnt;
-     } else {
-         // found a perfect match
-         QFont fnt(family, pointSize);
-         fnt.setStyleName(s->key.styleName);
-         return fnt;
-     }
+ 
+     QFont fnt(family, pointSize, s->key.weight);
+     fnt.setStyle((QFont::Style)s->key.style);
+     if (!s->styleName.isEmpty())
+         fnt.setStyleName(s->styleName);
+     return fnt;
  }
  
  

diff --cc src/gui/text/qfontdatabase_qpa.cpp
Simple merge

diff --cc src/gui/text/qtextdocument.cpp
Simple merge

diff --cc src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
index 9bf857d,1047cb8..320113f
--- 1/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
--- 2/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
@@@ -40,14 -40,8 +40,16 @@@
  ****************************************************************************/
  
  #include "qwaylandxcompositeeglwindow.h"
 +#include "qwaylandxcompositebuffer.h"
 +
 +#include <QtPlatformSupport/private/qeglconvenience_p.h>
 +#include <QtPlatformSupport/private/qxlibeglintegration_p.h>
 +
 +#include "wayland-xcomposite-client-protocol.h"
 +
 +#include <X11/extensions/Xcomposite.h>
+ #include "qwaylandxcompositeeglintegration.h"
+ #include "windowmanager_integration/qwaylandwindowmanagerintegration.h"
  
  #include <QtCore/QDebug>
  
@@@ -69,81 -59,30 +71,90 @@@ QWaylandWindow::WindowType QWaylandXCom
      return QWaylandWindow::Egl;
  }
  
 -QPlatformGLContext * QWaylandXCompositeEGLWindow::glContext() const
 +void QWaylandXCompositeEGLWindow::setGeometry(const QRect &rect)
  {
 -    if (!mContext) {
 -        qDebug() << "creating glcontext;";
 -        QWaylandXCompositeEGLWindow *that = const_cast<QWaylandXCompositeEGLWindow *>(this);
 -        that->mContext = new QWaylandXCompositeEGLContext(mGlxIntegration,that);
 +    QWaylandWindow::setGeometry(rect);
 +
 +    if (m_surface) {
 +        eglDestroySurface(m_glxIntegration->eglDisplay(), m_surface);
 +        m_surface = 0;
      }
 -    return mContext;
  }
  
 -void QWaylandXCompositeEGLWindow::setGeometry(const QRect &rect)
 +EGLSurface QWaylandXCompositeEGLWindow::eglSurface() const
  {
 -    QWaylandWindow::setGeometry(rect);
 +    if (!m_surface)
 +        const_cast<QWaylandXCompositeEGLWindow *>(this)->createEglSurface();
 +    return m_surface;
 +}
 +
 +void QWaylandXCompositeEGLWindow::createEglSurface()
 +{
 +    QSize size(geometry().size());
 +    if (size.isEmpty()) {
 +        // QGLWidget wants a context for a window without geometry
 +        size = QSize(1,1);
 +    }
  
 -    if (mContext) {
 -        mContext->geometryChanged();
 +    delete m_buffer;
 +    //XFreePixmap deletes the glxPixmap as well
 +    if (m_xWindow) {
 +        XDestroyWindow(m_glxIntegration->xDisplay(), m_xWindow);
      }
 +
 +    VisualID visualId = QXlibEglIntegration::getCompatibleVisualId(m_glxIntegration->xDisplay(), m_glxIntegration->eglDisplay(), m_config);
 +
 +    XVisualInfo visualInfoTemplate;
 +    memset(&visualInfoTemplate, 0, sizeof(XVisualInfo));
 +    visualInfoTemplate.visualid = visualId;
 +
 +    int matchingCount = 0;
 +    XVisualInfo *visualInfo = XGetVisualInfo(m_glxIntegration->xDisplay(), VisualIDMask, &visualInfoTemplate, &matchingCount);
 +
 +    Colormap cmap = XCreateColormap(m_glxIntegration->xDisplay(),m_glxIntegration->rootWindow(),visualInfo->visual,AllocNone);
 +
 +    XSetWindowAttributes a;
 +    a.colormap = cmap;
 +    m_xWindow = XCreateWindow(m_glxIntegration->xDisplay(), m_glxIntegration->rootWindow(),0, 0, size.width(), size.height(),
 +                             0, visualInfo->depth, InputOutput, visualInfo->visual,
 +                             CWColormap, &a);
 +
 +    XCompositeRedirectWindow(m_glxIntegration->xDisplay(), m_xWindow, CompositeRedirectManual);
 +    XMapWindow(m_glxIntegration->xDisplay(), m_xWindow);
 +
 +    m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(), m_config, m_xWindow,0);
 +    if (m_surface == EGL_NO_SURFACE) {
 +        qFatal("Could not make eglsurface");
 +    }
 +
 +    XSync(m_glxIntegration->xDisplay(),False);
 +    mBuffer = new QWaylandXCompositeBuffer(m_glxIntegration->waylandXComposite(),
 +                                           (uint32_t)m_xWindow,
 +                                           size,
 +                                           m_glxIntegration->waylandDisplay()->argbVisual());
 +    attach(m_buffer);
 +    wl_display_sync_callback(m_glxIntegration->waylandDisplay()->wl_display(),
 +                             QWaylandXCompositeEGLWindow::sync_function,
 +                             this);
 +
 +    m_waitingForSync = true;
 +    wl_display_sync(m_glxIntegration->waylandDisplay()->wl_display(),0);
 +    m_glxIntegration->waylandDisplay()->flushRequests();
 +    while (m_waitingForSync)
 +        m_glxIntegration->waylandDisplay()->readEvents();
 +}
 +
 +void QWaylandXCompositeEGLWindow::sync_function(void *data)
 +{
 +    QWaylandXCompositeEGLWindow *that = static_cast<QWaylandXCompositeEGLWindow *>(data);
 +    that->m_waitingForSync = false;
  }
+ 
+ void QWaylandXCompositeEGLWindow::requestActivateWindow()
+ {
+ #ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
+     mDisplay->windowManagerIntegration()->authenticateWithToken();
+ #endif
+ 
+     QWaylandWindow::requestActivateWindow();
+ }

diff --cc src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.h
index 535498a,ea4dd2d..b2f8fbe
--- 1/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.h
--- 2/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.h
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.h
@@@ -51,27 -49,18 +51,28 @@@
  class QWaylandXCompositeEGLWindow : public QWaylandWindow
  {
  public:
 -    QWaylandXCompositeEGLWindow(QWidget *window, QWaylandXCompositeEGLIntegration *glxIntegration);
 +    QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLIntegration *glxIntegration);
      WindowType windowType() const;
  
 -    QPlatformGLContext *glContext() const;
 -
      void setGeometry(const QRect &rect);
+     void requestActivateWindow();
  
 +    EGLSurface eglSurface() const;
 +
  private:
 -    QWaylandXCompositeEGLIntegration *mGlxIntegration;
 -    QWaylandXCompositeEGLContext *mContext;
 +    void createEglSurface();
 +
 +    QWaylandXCompositeEGLIntegration *m_glxIntegration;
 +    QWaylandXCompositeEGLContext *m_context;
 +    QWaylandBuffer *m_buffer;
 +
 +    Window m_xWindow;
 +    EGLConfig m_config;
 +    EGLSurface m_surface;
 +
 +    bool m_waitingForSync;
  
 +    static void sync_function(void *data);
  };
  
  #endif // QWAYLANDXCOMPOSITEEGLWINDOW_H

diff --cc src/widgets/platforms/mac/qfontdatabase_mac.cpp
Simple merge

diff --cc src/widgets/platforms/mac/qfontengine_coretext.mm
Simple merge

diff --cc src/widgets/platforms/mac/qfontengine_coretext_p.h
Simple merge

diff --cc src/widgets/platforms/s60/qfontdatabase_s60.cpp
Simple merge

diff --cc src/widgets/platforms/win/qfontdatabase_win.cpp
Simple merge

diff --cc src/widgets/platforms/x11/qfontdatabase_x11.cpp
Simple merge

diff --cc sync.profile
Simple merge