Merge branch 'refactor'

Conflicts:
	mkspecs/qws/linux-lsb-g++/qmake.conf
	src/gui/image/qpixmap_mac.cpp
	src/gui/painting/qpaintengine_x11.cpp
	src/gui/painting/qtessellator.cpp
	src/gui/text/qfontengine_qws.cpp
	src/gui/text/qfontengine_x11.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/opengl/qgl.h
	src/opengl/qgl_x11egl.cpp
	src/plugins/plugins.pro

Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310

bin/fixqt4headers

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+modules=`ls $QTDIR/include`
+
+files=`find * -name '*.h' -or -name '*.cpp' -or -name '*.C' -or -name '*.cc' -or -name '*.CC'`
+
+echo $files
+
+for module in $modules; do
+# once we change other things, change the line from == "QtWidgets" to != "Qt" to get everything fixed
+    if [ $module == "QtWidgets" ] || [ $module == "QtPrintSupport" ]; then
+        echo $module ":"
+        includes=`ls $QTDIR/include/$module`
+        for i in $includes; do
+#            echo "    fixing " $i
+            perl -pi -e "s,^#include +<.+/$i>,#include <$module/$i>," $files;
+#            perl -pi -e 's,^#include +".+/$i",#include "$module/$i",' $files;
+        done;
+    fi;
+done;
+
+perl -pi -e 's,<QtGui>,<QtWidgets>,' $files
+perl -pi -e 's,<QtGui/QtGui>,<QtWidgets/QtWidgets>,' $files

config.tests/qpa/wayland/wayland.pro

@@ -1,4 +1,12 @@
 SOURCES = wayland.cpp
 CONFIG -= qt
-INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND
+
+for(d, QMAKE_INCDIR_WAYLAND) {
+    exists($$d):INCLUDEPATH += $$d
+}
+
+for(p, QMAKE_LIBDIR_WAYLAND) {
+    exists($$p):LIBS += -L$$p
+}
+
 LIBS += $$QMAKE_LIBS_WAYLAND

config.tests/qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.cpp

@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <xcb/xcb.h>
+#include <xcb/xcb_icccm.h>
+#include <xcb/xfixes.h>
+#include <xcb/xcb_image.h>
+#include <xcb/xcb_keysyms.h>
+#include <xcb/sync.h>
+#include <xcb/shm.h>
+
+int main(int, char **)
+{
+    int primaryScreen = 0;
+
+    xcb_connection_t *connection = xcb_connect("", &primaryScreen);
+
+    xcb_generic_event_t *event = xcb_poll_for_queued_event(connection);
+
+    return 0;
+}

config.tests/qpa/xcb-poll-for-queued-event/xcb-poll-for-queued-event.pro

@@ -0,0 +1,5 @@
+SOURCES = xcb-poll-for-queued-event.cpp
+CONFIG -= qt
+
+LIBS += -lxcb -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-sync -lxcb-xfixes
+

config.tests/qpa/xcb-render/xcb-render.cpp

@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,38 +39,34 @@
 **
 ****************************************************************************/
 
-#include <qdecorationplugin_qws.h>
-#include <qdecorationwindows_qws.h>
+#include <xcb/xcb.h>
+#include <xcb/render.h>
 
-QT_BEGIN_NAMESPACE
-
-class DecorationWindows : public QDecorationPlugin
-{
-public:
-    DecorationWindows();
-
-    QStringList keys() const;
-    QDecoration *create(const QString&);
-};
-
-DecorationWindows::DecorationWindows()
-    : QDecorationPlugin()
-{
+// 'template' is used as a function argument name in xcb_renderutil.h
+#define template template_param
+// extern "C" is missing too
+extern "C" {
+#include <xcb/xcb_renderutil.h>
 }
+#undef template
 
-QStringList DecorationWindows::keys() const
+int main(int, char **)
 {
-    return (QStringList() << QLatin1String("Windows"));
-}
+    int primaryScreen = 0;
+    xcb_generic_error_t *error = 0;
 
-QDecoration* DecorationWindows::create(const QString& s)
-{
-    if (s.toLower() == QLatin1String("windows"))
-        return new QDecorationWindows();
+    xcb_connection_t *connection = xcb_connect("", &primaryScreen);
+    xcb_render_query_pict_formats_cookie_t formatsCookie =
+        xcb_render_query_pict_formats(connection);
+
+    xcb_render_query_pict_formats_reply_t *formatsReply =
+        xcb_render_query_pict_formats_reply(
+                connection,
+                formatsCookie,
+                &error);
+
+    xcb_render_util_find_standard_format(formatsReply,
+            XCB_PICT_STANDARD_ARGB_32);
 
     return 0;
 }
-
-Q_EXPORT_PLUGIN2(qdecorationwindows, DecorationWindows)
-
-QT_END_NAMESPACE

config.tests/qpa/xcb-render/xcb-render.pro

@@ -0,0 +1,5 @@
+SOURCES = xcb-render.cpp
+CONFIG -= qt
+
+LIBS += -lxcb-render -lxcb-render-util
+

config.tests/qpa/xcb-xlib/xcb-xlib.cpp

@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the test suite of the Qt Toolkit.
+** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -38,12 +38,15 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "simple.h"
 
-#include "dataparser.h"
-#include <QString>
+#include <xcb/xcb.h>
+#include <X11/Xlib.h>
+#include <X11/Xlib-xcb.h>
 
-FullData simpleData()
+int main(int, char **)
 {
-    return parseFile(":/simple.data");
+    Display *dpy = XOpenDisplay("");
+    xcb_connection_t *connection =  XGetXCBConnection(dpy);
+
+    return 0;
 }

config.tests/qpa/xcb-xlib/xcb-xlib.pro

@@ -0,0 +1,5 @@
+SOURCES = xcb-xlib.cpp
+CONFIG -= qt
+
+LIBS += -lxcb -lX11 -lX11-xcb
+

config.tests/qpa/xcb/xcb.cpp

@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the config.tests of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,18 +39,19 @@
 **
 ****************************************************************************/
 
-#include "qpaintdevice.h"
-#include "qpainter.h"
-#include "qwidget.h"
-#include "qbitmap.h"
-#include "qapplication.h"
-#include "qwsdisplay_qws.h"
+#include <xcb/xcb.h>
+#include <xcb/xcb_icccm.h>
+#include <xcb/xfixes.h>
+#include <xcb/xcb_image.h>
+#include <xcb/xcb_keysyms.h>
+#include <xcb/sync.h>
+#include <xcb/shm.h>
 
-QT_BEGIN_NAMESPACE
-
-QWSDisplay *QPaintDevice::qwsDisplay()
+int main(int, char **)
 {
-    return qt_fbdpy;
-}
+    int primaryScreen = 0;
 
-QT_END_NAMESPACE
+    xcb_connection_t *connection = xcb_connect("", &primaryScreen);
+
+    return 0;
+}

config.tests/qpa/xcb/xcb.pro

@@ -0,0 +1,5 @@
+SOURCES = xcb.cpp
+CONFIG -= qt
+
+LIBS += -lxcb -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-sync -lxcb-xfixes
+

config.tests/unix/opengldesktop/opengldesktop.cpp

@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#if defined(Q_OS_MAC)
-# include <OpenGL/gl.h>
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
 #else
-# include <GL/gl.h>
+#include <GL/gl.h>
 #endif
 
 int main(int, char **)

configure

@@ -185,14 +185,12 @@ fi
 #-------------------------------------------------------------------------------
 
 PLATFORM_X11=no
-PLATFORM_QWS=maybe
-PLATFORM_QPA=maybe
+PLATFORM_QWS=no
+PLATFORM_QPA=yes
 BUILD_ON_MAC=no
+PLATFORM_MAC=no
 if [ -d /System/Library/Frameworks/Carbon.framework ]; then
-    PLATFORM_MAC=maybe
     BUILD_ON_MAC=yes
-else
-    PLATFORM_MAC=no
 fi
 
 #-----------------------------------------------------------------------------
@@ -752,7 +750,8 @@ CFG_DECORATION_PLUGIN_AVAILABLE=
 CFG_DECORATION_PLUGIN=
 CFG_XINPUT=runtime
 CFG_XKB=auto
-CFG_XCB=no
+CFG_XCB=auto
+CFG_XCB_LIMITED=yes
 CFG_NIS=auto
 CFG_CUPS=auto
 CFG_ICONV=auto
@@ -1378,9 +1377,9 @@ while [ "$#" -gt 0 ]; do
     opengl)
         if  [ "$VAL" = "auto" ] || [ "$VAL" = "desktop" ] ||
             [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] ||
-            [ "$VAL" = "es1" ] || [ "$VAL" = "es2" ]; then
+            [ "$VAL" = "es2" ]; then
             CFG_OPENGL="$VAL"
-            if  [ "$VAL" = "es1" ] || [ "$VAL" = "es2" ]; then
+            if  [ "$VAL" = "es2" ]; then
                 CFG_EGL="yes"
             fi
         else
@@ -3322,7 +3321,7 @@ if [ '!' -z "$CFG_SDK" ]; then
 fi
 
 # find the default framework value
-if [ "$PLATFORM_MAC" = "yes" ] && [ "$PLATFORM" != "macx-xlc" ]; then
+if [ "$CFG_ARCH" = "macosx" ]; then
     if [ "$CFG_FRAMEWORK" = "auto" ]; then
         CFG_FRAMEWORK="$CFG_SHARED"
     elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then
@@ -3461,7 +3460,7 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$XPLATFORM_SYMBIAN" = "no" ]; then
 fi
 
 # find the default framework value
-if [ "$PLATFORM_MAC" = "yes" ] && [ "$PLATFORM" != "macx-xlc" ]; then
+if [ "$CFG_ARCH" = "macosx" ]; then
     if [ "$CFG_FRAMEWORK" = "auto" ]; then
         CFG_FRAMEWORK="$CFG_SHARED"
     elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then
@@ -4179,9 +4178,9 @@ Qt/X11 only:
  +  -opengl <api> ...... Enable OpenGL support.
                          With no parameter, this will auto-detect the "best"
                          OpenGL API to use. If desktop OpenGL is available, it
-                         will be used. Use desktop, es1, or es2 for <api>
-                         to force the use of the Desktop (OpenGL 1.x or 2.x),
-                         OpenGL ES 1.x Common profile, or 2.x APIs instead.
+                         will be used. Use desktop or es2 for <api>
+                         to force the use of the Desktop OpenGL or
+                         OpenGL ES 2 APIs instead.
 
      -no-openvg ........ Do not support OpenVG.
  +   -openvg ........... Enable OpenVG support.
@@ -4341,9 +4340,9 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
 
     -no-opengl .......... Do not support OpenGL.
     -opengl <api> ....... Enable OpenGL ES support
-                          With no parameter, this will attempt to auto-detect OpenGL ES 1.x
-                          or 2.x, or regular desktop OpenGL.
-                          Use es1 or es2 for <api> to override auto-detection.
+                          With no parameter, this will attempt to auto-detect
+                          OpenGL ES 2, or regular desktop OpenGL.
+                          Use es2 for <api> to override auto-detection.
 EOF
 fi
 
@@ -5794,7 +5793,7 @@ fi
 
 # X11/MINGW/SYMBIAN OpenGL
 if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" -o "$XPLATFORM_SYMBIAN" = "yes" ]; then
-    # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es2 = OpenGL ES 2.x)
+    # auto-detect OpenGL support (es2 = OpenGL ES 2.x)
     if [ "$CFG_GUI" = "no" ]; then
         if [ "$CFG_OPENGL" = "auto" ]; then
             CFG_OPENGL=no
@@ -5813,11 +5812,6 @@ if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" -o "$XPLATFORM_SYMBIA
             if [ "$CFG_EGL" = "no" ]; then
                 CFG_EGL=auto
             fi
-        elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
-            CFG_OPENGL=es1
-            if [ "$CFG_EGL" = "no" ]; then
-                CFG_EGL=auto
-            fi
         else
             if [ "$CFG_OPENGL" = "yes" ]; then
                 echo "All the OpenGL functionality tests failed!"
@@ -5841,16 +5835,6 @@ if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" -o "$XPLATFORM_SYMBIA
         *)
             ;;
         esac
-    elif [ "$CFG_OPENGL" = "es1" ]; then
-        # OpenGL ES 1.x
-        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS
-        if [ $? != "0" ]; then
-            echo "The OpenGL ES 1.x functionality test failed!"
-            echo " You might need to modify the include and library search paths by editing"
-            echo " QMAKE_INCDIR_OPENGL_ES1, QMAKE_LIBDIR_OPENGL_ES1 and QMAKE_LIBS_OPENGL_ES1 in"
-            echo " ${XQMAKESPEC}."
-            exit 1
-        fi
     elif [ "$CFG_OPENGL" = "es2" ]; then
         #OpenGL ES 2.x
         "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS
@@ -6183,14 +6167,14 @@ fi
 
 
 if [ "$PLATFORM_QPA" = "yes" ]; then
-    # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es2 = OpenGL ES 2.x)
-    if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+    # auto-detect OpenGL support (es2 = OpenGL ES 2.x)
+    if [ "$CFG_ARCH" = "macosx" ]; then
+        CFG_OPENGL=desktop
+    elif [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengldesktop "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
             CFG_OPENGL=desktop
         elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
             CFG_OPENGL=es2
-        elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
-            CFG_OPENGL=es1
         else
             if [ "$CFG_OPENGL" = "yes" ]; then
                 echo "All the OpenGL functionality tests failed!"
@@ -6201,16 +6185,6 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
             fi
             CFG_OPENGL=no
         fi
-    elif [ "$CFG_OPENGL" = "es1" ]; then
-        # OpenGL ES 1.x
-        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS
-        if [ $? != "0" ]; then
-            echo "The OpenGL ES 1.x functionality test failed!"
-            echo " You might need to modify the include and library search paths by editing"
-            echo " QMAKE_INCDIR_OPENGL_ES1, QMAKE_LIBDIR_OPENGL_ES1 and QMAKE_LIBS_OPENGL_ES1 in"
-            echo " ${XQMAKESPEC}."
-            exit 1
-        fi
     elif [ "$CFG_OPENGL" = "es2" ]; then
         #OpenGL ES 2.x
         if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists glesv2 2>/dev/null; then
@@ -6266,15 +6240,46 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
         QMAKE_LIBS_WAYLAND=`$PKG_CONFIG --libs wayland-client 2>/dev/null`
         QMAKE_INCDIR_WAYLAND=`$PKG_CONFIG --variable=includedir wayland-client 2>/dev/null`
         QMAKE_LIBDIR_WAYLAND=`$PKG_CONFIG --variable=libdir wayland-client 2>/dev/null`
+    fi
 
-        if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists xkbcommon 2>/dev/null; then
-            QMAKE_CFLAGS_WAYLAND="$QMAKE_CFLAGS_WAYLAND `$PKG_CONFIG --cflags xkbcommon 2>/dev/null`"
-            QMAKE_LIBS_WAYLAND="$QMAKE_LIBS_WAYLAND `$PKG_CONFIG --libs xkbcommon 2>/dev/null`"
+    # Check we actually have X11 :-)
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+        QT_CONFIG="$QT_CONFIG xlib"
+    fi
+
+    if [ "$CFG_XCB" != "no" ]; then
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/xcb "xcb" $L_FLAGS $I_FLAGS $l_FLAGS; then
+            CFG_XCB=yes
+            if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/xcb-render "xcb-render" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                QT_CONFIG="$QT_CONFIG xcb-render"
+            fi
+
+            if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/xcb-poll-for-queued-event "xcb-poll-for-queued-event" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                CFG_XCB_LIMITED=no
+                QT_CONFIG="$QT_CONFIG xcb-poll-for-queued-event"
+            fi
+
+            if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/xcb-xlib "xcb-xlib" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                QT_CONFIG="$QT_CONFIG xcb-xlib"
+            fi
         else
-            QMAKE_DEFINES_WAYLAND=QT_NO_WAYLAND_XKB
+            CFG_XCB=no
         fi
     fi
 
+    # Detect libxkbcommon
+    if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists xkbcommon 2>/dev/null; then
+        QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`"
+        QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`"
+        QMAKE_CFLAGS_WAYLAND="$QMAKE_CFLAGS_WAYLAND $QMAKE_CFLAGS_XKBCOMMON"
+        QMAKE_LIBS_WAYLAND="$QMAKE_LIBS_WAYLAND $QMAKE_LIBS_XKBCOMMON"
+        QMAKE_CFLAGS_XCB="$QMAKE_CFLAGS_XCB $QMAKE_CFLAGS_XKBCOMMON"
+        QMAKE_LIBS_XCB="$QMAKE_LIBS_XCB $QMAKE_LIBS_XKBCOMMON"
+    else
+        QMAKE_DEFINES_WAYLAND=QT_NO_WAYLAND_XKB
+        QMAKE_DEFINES_XCB=QT_NO_XCB_XKB
+    fi
+
     # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero.
     if [ -n "$QMAKE_CFLAGS_WAYLAND" ] || [ -n "$QMAKE_LIBS_WAYLAND" ]; then
         QMakeVar set QMAKE_CFLAGS_WAYLAND "$QMAKE_CFLAGS_WAYLAND"
@@ -6284,6 +6289,12 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
         QMakeVar set QMAKE_DEFINES_WAYLAND " $QMAKE_DEFINES_WAYLAND"
     fi
 
+    if [ -n "$QMAKE_CFLAGS_XCB" ] || [ -n "$QMAKE_LIBS_XCB" ]; then
+        QMakeVar set QMAKE_CFLAGS_XCB "$QMAKE_CFLAGS_XCB"
+        QMakeVar set QMAKE_LIBS_XCB "$QMAKE_LIBS_XCB"
+        QMakeVar set QMAKE_DEFINES_XCB "$QMAKE_DEFINES_XCB"
+    fi
+
     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_WAYLAND $QMAKE_LIBS_WAYLAND; then
         QT_CONFIG="$QT_CONFIG wayland"
     fi
@@ -6300,7 +6311,7 @@ fi
 # QWS
 if [ "$PLATFORM_QWS" = "yes" ]; then
 
-    # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es2 = OpenGL ES 2.x)
+    # auto-detect OpenGL support (es2 = OpenGL ES 2.x)
     if [ "$CFG_GUI" = "no" ]; then
         if [ "$CFG_OPENGL" = "auto" ]; then
             CFG_OPENGL=no
@@ -6315,26 +6326,7 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
         CFG_EGL=auto
         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
             CFG_OPENGL=es2
-    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then
-            CFG_OPENGL=es1
-        else
-            echo "All the OpenGL ES functionality tests failed!"
-            echo " You might need to modify the include and library search paths by editing"
-            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
-            echo " ${XQMAKESPEC}."
-            exit 1
         fi
-    elif [ "$CFG_OPENGL" = "es1" ]; then
-        # OpenGL ES 1.x
-        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS
-        if [ $? != "0" ]; then
-            echo "The OpenGL ES 1.x functionality test failed!"
-            echo " You might need to modify the include and library search paths by editing"
-            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
-            echo " ${XQMAKESPEC}."
-            exit 1
-        fi
-        CFG_EGL=yes
     elif [ "$CFG_OPENGL" = "es2" ]; then
         #OpenGL ES 2.x
         "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS
@@ -6444,16 +6436,6 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
             CFG_EGL=yes
         fi
 
-        # Prefer this variant for ES1
-        if [ "$CFG_OPENGL" = "es1" -o "$EGL_VARIANT" = "none" ]; then
-            if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl4gles1" "EGL (GLES/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then
-                # EGL specified by QMAKE_*_EGL, included with <GLES/egl.h>
-                EGL_VARIANT=gles
-                CFG_EGL=yes
-                CFG_EGL_GLES_INCLUDES=yes
-            fi
-        fi
-
         if [ "$EGL_VARIANT" = "none" ]; then
             if [ "$CFG_EGL" = "yes" ]; then
                 echo "The EGL functionality test failed!"
@@ -6465,7 +6447,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
             fi
             CFG_EGL=no
             # If QtOpenGL would be built against OpenGL ES, disable it as we can't to that if EGL is missing
-            if [ "$CFG_OPENGL" = "es1" -o "$CFG_OPENGL" = "es2" ]; then
+            if [ "$CFG_OPENGL" = "es2" ]; then
                 CFG_OPENGL=no
             fi
         fi
@@ -6941,19 +6923,6 @@ fi
 [ "$XPLATFORM_MINGW" = "yes" ] && CFG_MAC_COCOA="no"
 [ "$XPLATFORM_SYMBIAN" = "yes" ] && CFG_MAC_COCOA="no"
 
-# set the global Mac deployment target. This is overridden on an arch-by-arch basis
-# in some cases, see code further down
-case "$PLATFORM,$CFG_MAC_COCOA" in
-    macx*,yes)
-	# Cocoa
-	QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
-	;;
-    macx*,no)
-	# gcc, Carbon
-	QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
-	;;
-esac
-
 # disable Qt 3 support on VxWorks and Symbian
 case "$XPLATFORM" in
     unsupported/vxworks*|symbian*)
@@ -7036,18 +7005,10 @@ else
     QT_CONFIG="$QT_CONFIG opengl"
 fi
 
-if [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es2" ]; then
-    if [ "$PLATFORM_QWS" = "yes" ]; then
-        QCONFIG_FLAGS="$QCONFIG_FLAGS Q_BACKINGSTORE_SUBSURFACES"
-    fi
+if [ "$CFG_OPENGL" = "es2" ]; then
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES"
 fi
 
-if [ "$CFG_OPENGL" = "es1" ]; then
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_1"
-    QT_CONFIG="$QT_CONFIG opengles1"
-fi
-
 if [ "$CFG_OPENGL" = "es2" ]; then
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_2"
     QT_CONFIG="$QT_CONFIG opengles2"
@@ -7349,7 +7310,7 @@ if [ '!' -z "$I_FLAGS" ]; then
 fi
 
 # turn off exceptions for the compilers that support it
-if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
+if [ "$PLATFORM_QWS" = "yes" ]; then
     COMPILER=`echo $XPLATFORM | cut -f 3- -d-`
 elif [ "$XPLATFORM" != "$PLATFORM" ]; then
     COMPILER=`echo $XPLATFORM | cut -f 2- -d-`
@@ -7707,9 +7668,7 @@ if [ "$CFG_EXCEPTIONS" = "no" ]; then
 fi
 
 # On Mac, set the minimum deployment target for the different architechtures 
-# using the Xarch compiler option when supported (10.5 and up).  On 10.4 the
-# deployment version is set to 10.4 globally using the QMAKE_MACOSX_DEPLOYMENT_TARGET
-# env. variable. 
+# using the Xarch compiler option when supported (10.5 and up).
 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
     if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
         QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
@@ -8529,8 +8488,6 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
 fi
 if [ "$CFG_OPENGL" = "desktop" ]; then
     echo "OpenGL support ......... yes (Desktop OpenGL)"
-elif [ "$CFG_OPENGL" = "es1" ]; then
-    echo "OpenGL support ......... yes (OpenGL ES 1.x Common profile)"
 elif [ "$CFG_OPENGL" = "es2" ]; then
     echo "OpenGL support ......... yes (OpenGL ES 2.x)"
 else
@@ -8590,7 +8547,11 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
 fi
 echo "ICD support ............ $CFG_ICD"
 echo "libICU support ......... $CFG_ICU"
-echo "Xcb support ............ $CFG_XCB"
+if [ "$CFG_XCB_LIMITED" = "yes" ] && [ "$CFG_XCB" = "yes" ]; then
+    echo "Xcb support ............ limited (old version)"
+else
+    echo "Xcb support ............ $CFG_XCB"
+fi
 echo
 
 [ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........... $CFG_PTMALLOC"

doc/src/snippets/alphachannel.cpp

@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qprinter.h>
-#include <qpainter.h>
-#include <qfile.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <QtGui>
-#include <QtCore>
-
-class MyClass : public QWidget
-{
-public:
-     MyClass(QWidget *parent = 0) : QWidget(parent) { }
-
-protected:
-     void paintEvent(QPaintEvent *e)
-     {
-        /*QRadialGradient rg(50, 50, 50, 50, 50);
-         rg.setColorAt(0, QColor::fromRgbF(1, 0, 0, 1));
-         rg.setColorAt(1, QColor::fromRgbF(0, 0, 0, 0));
-         QPainter pmp(&pm);
-         pmp.fillRect(0, 0, 100, 100, rg);
-         pmp.end();*/
-
-	createImage();
-
-	QPainter p(this);
-	p.fillRect(rect(), Qt::white);
-
-	p.drawPixmap(0, 0, pixmap);
-
-	p.drawPixmap(100, 0, channelImage);
-     }
-
-    void createImage()
-    {
-//! [0]
-	pixmap = QPixmap(100, 100);
-	pixmap.fill(Qt::transparent);
-
-	QRadialGradient gradient(50, 50, 50, 50, 50);
-	gradient.setColorAt(0, QColor::fromRgbF(1, 0, 0, 1));
-	gradient.setColorAt(1, QColor::fromRgbF(0, 0, 0, 0));
-	QPainter painter(&pixmap);
-	painter.fillRect(0, 0, 100, 100, gradient);
-
-	channelImage = pixmap.alphaChannel();
-	update();
-//! [0]
-    }
-
-    QPixmap channelImage, pixmap;
-    QSize sizeHint() const { return QSize(500, 500); }
-};
-
-int main(int argc, char **argv)
-{
-     QApplication app(argc, argv);
-
-     MyClass cl;
-     cl.show();
-     QObject::connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));
-
-     int ret = app.exec();
-     return ret;
-}

examples/animation/animatedtiles/animatedtiles.pro

@@ -11,4 +11,5 @@ symbian {
     TARGET.UID3 = 0xA000D7D1
     CONFIG += qt_example
 }
+QT += widgets
 maemo5: CONFIG += qt_example

examples/animation/animatedtiles/main.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtCore/qstate.h>
 
 class Pixmap : public QObject, public QGraphicsPixmapItem

examples/animation/animation.pro

@@ -14,3 +14,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animation.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation
 INSTALLS += target sources
+QT += widgets

examples/animation/appchooser/appchooser.pro

@@ -11,4 +11,5 @@ symbian {
     TARGET.UID3 = 0xA000E3F5
     CONFIG += qt_example
 }
+QT += widgets
 maemo5: CONFIG += qt_example

examples/animation/appchooser/main.cpp

@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
 
 
 class Pixmap : public QGraphicsWidget
@@ -88,7 +88,7 @@ public:
     {
     }
 
-    virtual void resizeEvent(QResizeEvent *event)
+    virtual void resizeEvent(QResizeEvent *)
     {
         fitInView(sceneRect(), Qt::KeepAspectRatio);
     }

examples/animation/easing/animation.h

@@ -41,7 +41,7 @@
 #ifndef ANIMATION_H
 #define ANIMATION_H
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include <QtCore/qpropertyanimation.h>
 

examples/animation/easing/easing.pro

@@ -17,5 +17,6 @@ symbian {
     TARGET.UID3 = 0xA000E3F6
     CONFIG += qt_example
 }
+QT += widgets
 
 maemo5: CONFIG += qt_example

examples/animation/easing/main.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include "window.h"
 
 int main(int argc, char **argv)

examples/animation/easing/window.h

@@ -38,7 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
+
 #include "ui_form.h"
 #include "animation.h"
 

examples/animation/moveblocks/main.cpp

@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
 
 //![15]
 class StateSwitchEvent: public QEvent

examples/animation/moveblocks/moveblocks.pro

@@ -10,4 +10,5 @@ symbian {
     TARGET.UID3 = 0xA000E3F7
     CONFIG += qt_example
 }
+QT += widgets
 maemo5: CONFIG += qt_example

examples/animation/states/main.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 class Pixmap : public QGraphicsObject
 {
@@ -69,7 +69,7 @@ public:
     {
     }
 
-    virtual void resizeEvent(QResizeEvent *event)
+    virtual void resizeEvent(QResizeEvent *)
     {
         fitInView(sceneRect(), Qt::KeepAspectRatio);
     }

examples/animation/states/states.pro

@@ -11,4 +11,5 @@ symbian {
     TARGET.UID3 = 0xA000E3F8
     CONFIG += qt_example
 }
+QT += widgets
 maemo5: CONFIG += qt_example

examples/animation/stickman/graphicsview.cpp

@@ -42,8 +42,8 @@
 #include "stickman.h"
 
 #include <QtGui/QKeyEvent>
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QGraphicsView>
+#include <QtWidgets/QGraphicsScene>
+#include <QtWidgets/QGraphicsView>
 
 GraphicsView::GraphicsView(QWidget *parent) : QGraphicsView(parent), m_editor(0) {}
 
@@ -54,7 +54,7 @@ void GraphicsView::keyPressEvent(QKeyEvent *e)
     emit keyPressed(Qt::Key(e->key()));
 }
 
-void GraphicsView::resizeEvent(QResizeEvent *event)
+void GraphicsView::resizeEvent(QResizeEvent *)
 {
     fitInView(scene()->sceneRect());
 }

examples/animation/stickman/graphicsview.h

@@ -41,7 +41,7 @@
 #ifndef GRAPHICSVIEW_H
 #define GRAPHICSVIEW
 
-#include <QtGui/QGraphicsView>
+#include <QtWidgets/QGraphicsView>
 
 class MainWindow;
 class GraphicsView: public QGraphicsView

examples/animation/stickman/lifecycle.cpp

@@ -45,7 +45,7 @@
 #include "graphicsview.h"
 
 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
 
 class KeyPressTransition: public QSignalTransition
 {

examples/animation/stickman/main.cpp

@@ -46,7 +46,7 @@
 #include "rectbutton.h"
 
 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
 
 int main(int argc, char **argv)
 {

examples/animation/stickman/rectbutton.cpp

@@ -51,7 +51,7 @@ RectButton::~RectButton()
 }
 
 
-void RectButton::mousePressEvent (QGraphicsSceneMouseEvent *event)
+void RectButton::mousePressEvent (QGraphicsSceneMouseEvent *)
 {
     emit clicked();
 }
@@ -63,7 +63,7 @@ QRectF RectButton::boundingRect() const
 }
 
 
-void RectButton::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void RectButton::paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option */, QWidget * /* widget */)
 {
     painter->setBrush(Qt::gray);
     painter->drawRoundedRect(boundingRect(), 5, 5);

examples/animation/stickman/stickman.pro

@@ -24,4 +24,5 @@ symbian {
     TARGET.UID3 = 0xA000E3F9
     CONFIG += qt_example
 }
+QT += widgets
 maemo5: CONFIG += qt_example

examples/animation/sub-attaq/boat_p.h

@@ -58,7 +58,7 @@
 #include "graphicsscene.h"
 
 // Qt
-#include <QtGui/QKeyEventTransition>
+#include <QtWidgets/QKeyEventTransition>
 
 static const int MAX_BOMB = 5;
 

examples/animation/sub-attaq/graphicsscene.cpp

@@ -59,12 +59,12 @@
 #include <QtCore/QStateMachine>
 #include <QtCore/QFinalState>
 #include <QtCore/QPauseAnimation>
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 #include <QtCore/QDir>
-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QGraphicsSceneMouseEvent>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QGraphicsView>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
 #include <QtCore/QXmlStreamReader>
 
 GraphicsScene::GraphicsScene(int x, int y, int width, int height, Mode mode)

examples/animation/sub-attaq/graphicsscene.h

@@ -43,7 +43,7 @@
 #define __GRAPHICSSCENE__H__
 
 //Qt
-#include <QtGui/QGraphicsScene>
+#include <QtWidgets/QGraphicsScene>
 #include <QtCore/QSet>
 #include <QtCore/QState>
 

examples/animation/sub-attaq/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "mainwindow.h"
 

examples/animation/sub-attaq/mainwindow.h

@@ -43,7 +43,7 @@
 #define __MAINWINDOW__H__
 
 //Qt
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 class GraphicsScene;
 QT_BEGIN_NAMESPACE
 class QGraphicsView;

examples/animation/sub-attaq/pixmapitem.h

@@ -46,7 +46,7 @@
 #include "graphicsscene.h"
 
 //Qt
-#include <QtGui/QGraphicsObject>
+#include <QtWidgets/QGraphicsObject>
 
 class PixmapItem : public QGraphicsObject
 {

examples/animation/sub-attaq/progressitem.h

@@ -43,7 +43,7 @@
 #define PROGRESSITEM_H
 
 //Qt
-#include <QtGui/QGraphicsTextItem>
+#include <QtWidgets/QGraphicsTextItem>
 
 class ProgressItem : public QGraphicsTextItem
 {

examples/animation/sub-attaq/states.cpp

@@ -50,10 +50,10 @@
 #include "textinformationitem.h"
 
 //Qt
-#include <QtGui/QMessageBox>
-#include <QtGui/QGraphicsView>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QGraphicsView>
 #include <QtCore/QStateMachine>
-#include <QtGui/QKeyEventTransition>
+#include <QtWidgets/QKeyEventTransition>
 #include <QtCore/QFinalState>
 
 PlayState::PlayState(GraphicsScene *scene, QState *parent)

examples/animation/sub-attaq/states.h

@@ -46,7 +46,7 @@
 #include <QtCore/QState>
 #include <QtCore/QSignalTransition>
 #include <QtCore/QPropertyAnimation>
-#include <QtGui/QKeyEventTransition>
+#include <QtWidgets/QKeyEventTransition>
 #include <QtCore/QSet>
 
 class GraphicsScene;

examples/animation/sub-attaq/sub-attaq.pro

@@ -1,4 +1,4 @@
-contains(QT_CONFIG, opengl):QT += opengl
+contains(QT_CONFIG, opengl):QT += opengl widgets
 HEADERS += boat.h \
     bomb.h \
     mainwindow.h \

examples/animation/sub-attaq/submarine.h

@@ -43,7 +43,7 @@
 #define __SUBMARINE__H__
 
 //Qt
-#include <QtGui/QGraphicsTransform>
+#include <QtWidgets/QGraphicsTransform>
 
 #include "pixmapitem.h"
 

examples/animation/sub-attaq/submarine_p.h

@@ -60,7 +60,7 @@
 
 //Qt
 #include <QtCore/QPropertyAnimation>
-#include <QtGui/QGraphicsScene>
+#include <QtWidgets/QGraphicsScene>
 
 //This state is describing when the boat is moving right
 class MovementState : public QAnimationState

examples/animation/sub-attaq/textinformationitem.h

@@ -43,7 +43,7 @@
 #define TEXTINFORMATIONITEM_H
 
 //Qt
-#include <QtGui/QGraphicsTextItem>
+#include <QtWidgets/QGraphicsTextItem>
 
 class TextInformationItem : public QGraphicsTextItem
 {

examples/dbus/complexpingpong/complexpingpong.pro

@@ -2,3 +2,4 @@ TEMPLATE = subdirs
 CONFIG += ordered
 win32:CONFIG += console
 SUBDIRS = complexping.pro complexpong.pro
+QT += widgets

examples/dbus/dbus-chat/chat.cpp

@@ -39,8 +39,8 @@
 ****************************************************************************/
 
 #include "chat.h"
-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
 
 #include "chat_adaptor.h"
 #include "chat_interface.h"

examples/dbus/dbus-chat/dbus-chat.pro

@@ -18,6 +18,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/chat
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example
 symbian: warning(This example does not work on Symbian platform)
 simulator: warning(This example does not work on Simulator platform)

examples/dbus/dbus.pro

@@ -15,4 +15,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus
 INSTALLS += sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example

examples/dbus/pingpong/pingpong.pro

@@ -2,3 +2,4 @@ TEMPLATE = subdirs
 CONFIG += ordered
 win32:CONFIG += console
 SUBDIRS = ping.pro pong.pro
+QT += widgets

examples/dbus/remotecontrolledcar/car/car.cpp

@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "car.h"
-#include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 #include <math.h>
 
 static const double Pi = 3.14159265358979323846264338327950288419717;

examples/dbus/remotecontrolledcar/car/car.pro

@@ -19,6 +19,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/car
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example
 symbian: warning(This example does not work on Symbian platform)
 simulator: warning(This example does not work on Simulator platform)

examples/dbus/remotecontrolledcar/car/main.cpp

@@ -40,9 +40,9 @@
 
 #include "car.h"
 #include "car_adaptor.h"
-#include <QtGui/QApplication>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QGraphicsScene>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QGraphicsView>
+#include <QtWidgets/QGraphicsScene>
 #include <QtDBus/QDBusConnection>
 
 int main(int argc, char *argv[])

examples/dbus/remotecontrolledcar/controller/controller.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "controller.h"
 #include "car_interface.h"

examples/dbus/remotecontrolledcar/controller/controller.pro

@@ -20,6 +20,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controlle
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example
 symbian: warning(This example does not work on Symbian platform)
 simulator: warning(This example does not work on Simulator platform)

examples/dbus/remotecontrolledcar/controller/main.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtDBus>
 
 #include "controller.h"

examples/dbus/remotecontrolledcar/remotecontrolledcar.pro

@@ -8,4 +8,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar
 INSTALLS += sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example

examples/desktop/desktop.pro

@@ -9,4 +9,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example

examples/desktop/screenshot/screenshot.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "screenshot.h"
 

examples/desktop/screenshot/screenshot.pro

@@ -9,6 +9,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/screenshot
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example
 symbian: warning(This example might not fully work on Symbian platform)
 maemo5: warning(This example might not fully work on Maemo platform)

examples/dialogs/classwizard/classwizard.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "classwizard.h"
 

examples/dialogs/classwizard/classwizard.pro

@@ -10,6 +10,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/classwizard
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example
 symbian: warning(This example might not fully work on Symbian platform)
 maemo5: warning(This example might not fully work on Maemo platform)

examples/dialogs/configdialog/configdialog.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "configdialog.h"
 #include "pages.h"

examples/dialogs/configdialog/configdialog.pro

@@ -14,6 +14,7 @@ INSTALLS += target sources
 symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
 
+QT += widgets
 maemo5: CONFIG += qt_example
 symbian: warning(This example might not fully work on Symbian platform)
 maemo5: warning(This example might not fully work on Maemo platform)

examples/dialogs/configdialog/pages.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "pages.h"
 

examples/dialogs/dialogs.pro

@@ -17,4 +17,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs
 INSTALLS += sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example

examples/dialogs/extension/extension.pro

@@ -9,5 +9,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example
 simulator: warning(This example might not fully work on Simulator platform)

examples/dialogs/extension/finddialog.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "finddialog.h"
 

examples/dialogs/findfiles/findfiles.pro

@@ -9,4 +9,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/findfiles
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example

examples/dialogs/findfiles/window.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "window.h"
 

examples/dialogs/licensewizard/licensewizard.cpp

@@ -38,7 +38,9 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
+#include <QPrinter>
+#include <QPrintDialog>
 
 #include "licensewizard.h"
 
@@ -350,10 +352,12 @@ void ConclusionPage::setVisible(bool visible)
 
 void ConclusionPage::printButtonClicked()
 {
+#ifndef QT_NO_PRINTER
     QPrinter printer;
     QPrintDialog dialog(&printer, this);
     if (dialog.exec())
         QMessageBox::warning(this, tr("Print License"),
                              tr("As an environmentally friendly measure, the "
                                 "license text will not actually be printed."));
+#endif
 }

examples/dialogs/licensewizard/licensewizard.pro

@@ -10,6 +10,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/licensewizard
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets printsupport
 maemo5: CONFIG += qt_example
 symbian: warning(This example might not fully work on Symbian platform)
 maemo5: warning(This example might not fully work on Maemo platform)

examples/dialogs/sipdialog/dialog.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "dialog.h"
 

examples/dialogs/sipdialog/main.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "dialog.h"
 

examples/dialogs/sipdialog/sipdialog.pro

@@ -11,6 +11,8 @@ INSTALLS += target sources
 symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
 
+QT += widgets
+
 maemo5: CONFIG += qt_example
 symbian: warning(This example might not fully work on Symbian platform)
 maemo5: warning(This example might not fully work on Maemo platform)

examples/dialogs/standarddialogs/dialog.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "dialog.h"
 

examples/dialogs/standarddialogs/standarddialogs.pro

@@ -11,4 +11,5 @@ INSTALLS += target sources
 symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
 
+QT += widgets
 maemo5: CONFIG += qt_example

examples/dialogs/tabdialog/tabdialog.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "tabdialog.h"
 

examples/dialogs/tabdialog/tabdialog.pro

@@ -10,6 +10,7 @@ INSTALLS += target sources
 
 symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
+QT += widgets
 maemo5: CONFIG += qt_example
 symbian: warning(This example might not fully work on Symbian platform)
 maemo5: warning(This example might not fully work on Maemo platform)

examples/dialogs/trivialwizard/trivialwizard.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QTranslator>
 #include <QLocale>
 #include <QLibraryInfo>

examples/dialogs/trivialwizard/trivialwizard.pro

@@ -7,6 +7,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/trivialwizard
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example
 symbian: warning(This example might not fully work on Symbian platform)
 simulator: warning(This example might not fully work on Simulator platform)

examples/draganddrop/draganddrop.pro

@@ -11,3 +11,4 @@ symbian: SUBDIRS -= dropsite
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop
 INSTALLS += sources
+QT += widgets

examples/draganddrop/draggableicons/draggableicons.pro

@@ -13,4 +13,5 @@ symbian {
     TARGET.UID3 = 0xA000C615
     CONFIG += qt_example
 }
+QT += widgets
 maemo5: CONFIG += qt_example

examples/draganddrop/draggableicons/dragwidget.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "dragwidget.h"
 

examples/draganddrop/draggabletext/draggabletext.pro

@@ -15,5 +15,6 @@ symbian {
     TARGET.UID3 = 0xA000CF64
     CONFIG += qt_example
 }
+QT += widgets
 maemo5: CONFIG += qt_example
 simulator: warning(This example might not fully work on Simulator platform)

examples/draganddrop/draggabletext/draglabel.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "draglabel.h"
 

examples/draganddrop/draggabletext/dragwidget.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "draglabel.h"
 #include "dragwidget.h"

examples/draganddrop/dropsite/droparea.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "droparea.h"
 

examples/draganddrop/dropsite/dropsite.pro

@@ -11,6 +11,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/dropsite
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+QT += widgets
 maemo5: CONFIG += qt_example
 symbian: warning(This example might not fully work on Symbian platform)
 maemo5: warning(This example might not fully work on Maemo platform)

examples/draganddrop/dropsite/dropsitewindow.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "droparea.h"
 #include "dropsitewindow.h"

examples/draganddrop/fridgemagnets/draglabel.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "draglabel.h"
 

examples/draganddrop/fridgemagnets/dragwidget.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "draglabel.h"
 #include "dragwidget.h"

examples/draganddrop/fridgemagnets/fridgemagnets.pro

@@ -16,4 +16,6 @@ symbian {
     CONFIG += qt_example
 }
 
+QT += widgets
+
 maemo5: CONFIG += qt_example

examples/draganddrop/puzzle/mainwindow.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <stdlib.h>
 
 #include "mainwindow.h"

examples/draganddrop/puzzle/pieceslist.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "pieceslist.h"
 

examples/draganddrop/puzzle/puzzle.pro

@@ -27,4 +27,5 @@ wince*: {
    addFile.path = .
    DEPLOYMENT += addFile
 }
+QT += widgets
 maemo5: CONFIG += qt_example

examples/draganddrop/puzzle/puzzlewidget.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "puzzlewidget.h"
 

examples/effects/blurpicker/blurpicker.cpp

@@ -40,7 +40,7 @@
 
 #include "blurpicker.h"
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "blureffect.h"
 

examples/effects/blurpicker/blurpicker.pro

@@ -7,6 +7,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/blurpicker
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blurpicker.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/blurpicker
 INSTALLS += target sources
+QT += widgets
 
 symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example