Merge remote-tracking branch 'base/master' into refactor

Conflicts:
	demos/demos.pro
	demos/embedded/digiflip/digiflip.pro
	examples/examples.pro
	examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
	src/gui/kernel/qplatformglcontext_qpa.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
	src/plugins/platforms/wayland/qwaylanddisplay.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp

Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745

configure

@@ -699,7 +699,7 @@ CFG_FONTCONFIG=auto
 CFG_QWS_FREETYPE=auto
 CFG_LIBFREETYPE=auto
 CFG_SQL_AVAILABLE=
-QT_DEFAULT_BUILD_PARTS="libs examples demos tests"
+QT_DEFAULT_BUILD_PARTS="libs examples tests"
 CFG_BUILD_PARTS=""
 CFG_NOBUILD_PARTS=""
 CFG_RELEASE_QMAKE=no
@@ -849,7 +849,6 @@ QT_INSTALL_DATA=
 QT_INSTALL_TRANSLATIONS=
 QT_INSTALL_SETTINGS=
 QT_INSTALL_EXAMPLES=
-QT_INSTALL_DEMOS=
 QT_HOST_PREFIX=
 
 #flags for SQL drivers
@@ -1060,7 +1059,7 @@ while [ "$#" -gt 0 ]; do
         shift
         VAL=$1
         ;;
-    -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
+    -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         shift
         VAL="$1"
@@ -1314,9 +1313,6 @@ while [ "$#" -gt 0 ]; do
     examplesdir)
         QT_INSTALL_EXAMPLES="$VAL"
         ;;
-    demosdir)
-        QT_INSTALL_DEMOS="$VAL"
-        ;;
     qconfig)
         CFG_QCONFIG="$VAL"
         ;;
@@ -3545,7 +3541,6 @@ if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
     [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS="\\\\resource\\\\qt$QT_LIBINFIX\\\\translations"
     [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS=
     [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES=
-    [ -z "$QT_INSTALL_DEMOS" ] && QT_INSTALL_DEMOS=
 else
     #docs
     if [ -z "$QT_INSTALL_DOCS" ]; then #default
@@ -3652,17 +3647,6 @@ else
         [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback
     fi
     QT_INSTALL_EXAMPLES=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_EXAMPLES"`
-
-    #demos
-    if [ -z "$QT_INSTALL_DEMOS" ]; then #default
-        if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
-	    if [ "$PLATFORM_MAC" = "yes" ]; then
-	        QT_INSTALL_DEMOS="/Developer/Examples/Qt/Demos"
-            fi
-        fi
-        [ -z "$QT_INSTALL_DEMOS" ] && QT_INSTALL_DEMOS="$QT_INSTALL_PREFIX/demos"
-    fi
-    QT_INSTALL_DEMOS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DEMOS"`
 fi
 
 #-------------------------------------------------------------------------------
@@ -3731,8 +3715,8 @@ if [ "$OPT_HELP" = "yes" ]; then
 Usage:  $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir <dir>]
         [-docdir <dir>] [-headerdir <dir>] [-plugindir <dir> ] [-importdir <dir>] [-datadir <dir>]
         [-translationdir <dir>] [-sysconfdir <dir>] [-examplesdir <dir>]
-        [-demosdir <dir>] [-buildkey <key>] [-release] [-debug]
-        [-debug-and-release] [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile]
+        [-buildkey <key>] [-release] [-debug] [-debug-and-release]
+        [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile]
         [-largefile] [-no-exceptions] [-exceptions] [-no-accessibility]
         [-accessibility] [-no-stl] [-stl] [-no-sql-<driver>] [-sql-<driver>]
         [-plugin-sql-<driver>] [-system-sqlite] [-no-qt3support] [-qt3support]
@@ -3808,8 +3792,6 @@ cat <<EOF
                             (default PREFIX/etc/settings)
     -examplesdir <dir> .... Examples will be installed to <dir>
                             (default PREFIX/examples)
-    -demosdir <dir> ....... Demos will be installed to <dir>
-                            (default PREFIX/demos)
 
  You may use these options to turn on strict plugin loading.
 
@@ -4657,7 +4639,6 @@ DATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_INSTA
 TRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_INSTALL_TRANSLATIONS"`
 SETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
 EXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
-DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
 
 TODAY=`date +%Y-%m-%d`
 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
@@ -4682,7 +4663,6 @@ if [ ! -z "$QT_HOST_PREFIX" ]; then
     HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"`
     HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
     HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
-    HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
 
     cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
 
@@ -4699,7 +4679,6 @@ static const char qt_configure_data_path_str         [256 + 12] = "$HOSTDATA_PAT
 static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
 static const char qt_configure_settings_path_str     [256 + 12] = "$HOSTSETTINGS_PATH_STR";
 static const char qt_configure_examples_path_str     [256 + 12] = "$HOSTEXAMPLES_PATH_STR";
-static const char qt_configure_demos_path_str        [256 + 12] = "$HOSTDEMOS_PATH_STR";
 #else // QT_BOOTSTRAPPED
 EOF
 fi
@@ -4717,7 +4696,6 @@ static const char qt_configure_data_path_str         [256 + 12] = "$DATA_PATH_ST
 static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR";
 static const char qt_configure_settings_path_str     [256 + 12] = "$SETTINGS_PATH_STR";
 static const char qt_configure_examples_path_str     [256 + 12] = "$EXAMPLES_PATH_STR";
-static const char qt_configure_demos_path_str        [256 + 12] = "$DEMOS_PATH_STR";
 EOF
 
 if [ ! -z "$QT_HOST_PREFIX" ]; then
@@ -4742,7 +4720,6 @@ cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
 #define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;
 #define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12;
 #define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;
-#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;
 EOF
 
 # avoid unecessary rebuilds by copying only if qconfig.cpp has changed
@@ -9057,7 +9034,7 @@ for part in $CFG_BUILD_PARTS; do
     tools) PART_ROOTS="$PART_ROOTS tools" ;;
     libs) PART_ROOTS="$PART_ROOTS src tools/linguist/lrelease" ;;
     translations) PART_ROOTS="$PART_ROOTS translations" ;;
-    examples) PART_ROOTS="$PART_ROOTS examples demos" ;;
+    examples) PART_ROOTS="$PART_ROOTS examples" ;;
     *) ;;
     esac
 done

demos/README

@@ -1,39 +0,0 @@
-These demonstrations are intended to highlight Qt's capabilities in different
-application areas, and provide examples that are more advanced than those in
-the examples directory.
-
-Beginners to Qt may wish to try out the Qt tutorial and some of the examples
-before examining the demonstrations in detail.
-
-
-The example launcher can be used to explore the different categories
-available. It provides an overview of each example, lets you view the
-documentation in Qt Assistant, and is able to launch examples.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.

demos/demos.pro

@@ -1,99 +0,0 @@
-TEMPLATE    = subdirs
-
-!contains(QT_CONFIG, no-gui) {
-SUBDIRS     = \
-            demos_shared \
-            demos_deform \
-            demos_gradients \
-            demos_pathstroke \
-            demos_affine \
-            demos_composition \
-            demos_books \
-            demos_interview \
-            demos_mainwindow \
-            demos_spreadsheet \
-            demos_textedit \
-            demos_chip \
-            demos_embeddeddialogs \
-            demos_undo \
-            demos_sub-attaq
-
-symbian: SUBDIRS = \
-            demos_shared \
-            demos_deform \
-            demos_pathstroke
-
-
-wince*:  SUBDIRS = \
-            demos_shared \
-            demos_deform \
-            demos_gradients \
-            demos_pathstroke \
-            demos_affine \
-            demos_composition \
-            demos_books \
-            demos_interview \
-            demos_mainwindow \
-            demos_spreadsheet \
-            demos_textedit \
-            # demos_chip \
-            demos_embeddeddialogs \
-            demos_undo \
-            demos_sub-attaq
-
-contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles2):{
-SUBDIRS += demos_boxes
-}
-
-mac* && !qpa: SUBDIRS += demos_macmainwindow
-wince*|symbian|embedded|x11: SUBDIRS += demos_embedded
-
-!cross_compile:{
-contains(QT_BUILD_PARTS, tools):{
-SUBDIRS += demos_sqlbrowser
-}
-}
-
-# install
-sources.files = README *.pro
-sources.path = $$[QT_INSTALL_DEMOS]
-INSTALLS += sources
-
-symbian: CONFIG += qt_demo
-
-demos_chip.subdir = chip
-demos_embeddeddialogs.subdir = embeddeddialogs
-demos_embedded.subdir = embedded
-# Because of fluidlauncher
-demos_embedded.depends = demos_deform demos_pathstroke
-demos_shared.subdir = shared
-demos_deform.subdir = deform
-demos_gradients.subdir = gradients
-demos_pathstroke.subdir = pathstroke
-demos_affine.subdir = affine
-demos_composition.subdir = composition
-demos_books.subdir = books
-demos_interview.subdir = interview
-demos_macmainwindow.subdir = macmainwindow
-demos_mainwindow.subdir = mainwindow
-demos_spreadsheet.subdir = spreadsheet
-demos_textedit.subdir = textedit
-demos_arthurplugin.subdir = arthurplugin
-demos_sqlbrowser.subdir = sqlbrowser
-demos_undo.subdir = undo
-demos_qtdemo.subdir = qtdemo
-
-demos_boxes.subdir = boxes
-demos_sub-attaq.subdir = sub-attaq
-
-#CONFIG += ordered
-!ordered {
-     demos_affine.depends = demos_shared
-     demos_deform.depends = demos_shared
-     demos_gradients.depends = demos_shared
-     demos_composition.depends = demos_shared
-     demos_arthurplugin.depends = demos_shared
-     demos_pathstroke.depends = demos_shared
-}
-}
-QT += widgets widgets

demos/embedded/digiflip/digiflip.pro

@@ -1,12 +0,0 @@
-SOURCES = digiflip.cpp
-
-symbian {
-    TARGET.UID3 = 0xA000CF72
-    CONFIG += qt_demo
-}
-
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/digiflip
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/digiflip
-INSTALLS += target sources
-QT += widgets widgets

dist/changes-4.8.0

@@ -53,6 +53,7 @@ QtCore
  - QStringBuilder: added support for QByteArray
  - qSwap now uses std::swap, specialized std::swap for our container to work better with stl algoritms
  - QVariant: deprecated global function qVariantSetValue, qVariantValue, qVariantCanConvert, qVariantFromValue
+ - QUrl: add method for retrieving effective top level domain [QTBUG-13601] (MR-1205)
 
 QtGui
 -----
@@ -63,6 +64,21 @@ QtGui
  - QListView diverses optimisations [QTBUG-11438]
  - QTreeWidget/QListWidget: use localeAwareCompare for string comparisons [QTBUG-10839]
 
+QtNetwork
+---------
+
+ - SSL: Switch default version to TLS 1.0
+ - SSL: enable Server Name Indication (SNI) by default
+ - QSslCertificate: report fraudulent certificates as invalid ("Comodogate") [QTBUG-18338]
+ - QSslCertificate: display non-ASCII names from subject and issuerInfo (MR-922)
+ - QSslCertificate: loat root certificates on demand on Unix (excluding Mac) [QTBUG-14016]
+ - QNetworkCookie: retain quotes in value attribute [QTBUG-17746]
+ - QNetworkCookie: allow spaces in unquoted values [QTBUG-18876]
+ - HTTP API: add support for HTTP multipart messages [QTBUG-6222]
+ - HTTP cache: do not load resources from cache that must be revalidated [QTBUG-18983]
+ - HTTP cache: change file organization (MR-2505)
+
+
  QtOpenGL
  --------
  - Removed dependency of OpenGL Utility Library (GLU)

examples/animation/animation.pro

@@ -7,6 +7,7 @@ SUBDIRS          += \
                  moveblocks \
                  states \
                  stickman \
+                 sub-attaq \
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation

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

@@ -29,13 +29,13 @@ SOURCES += boat.cpp \
 RESOURCES += subattaq.qrc
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/sub-attaq
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/sub-attaq
 sources.files = $$SOURCES \
     $$HEADERS \
     $$RESOURCES \
     $$FORMS \
     sub-attaq.pro \
     pics
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/sub-attaq
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/sub-attaq
 INSTALLS += target \
     sources

examples/embedded/digiflip/digiflip.pro

@@ -0,0 +1,11 @@
+SOURCES = digiflip.cpp
+
+symbian {
+    TARGET.UID3 = 0xA000CF72
+    CONFIG += qt_example
+}
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/digiflip
+sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/digiflip
+INSTALLS += target sources

examples/embedded/embedded.pro

@@ -6,7 +6,7 @@ SUBDIRS += flightinfo
 
 # install
 sources.files = README *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded
 INSTALLS += sources
 
 symbian: CONFIG += qt_demo

examples/embedded/flickable/flickable.pro

@@ -3,11 +3,11 @@ HEADERS = flickable.h
 
 symbian {
     TARGET.UID3 = 0xA000CF73
-    CONFIG += qt_demo
+    CONFIG += qt_example
 }
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flickable
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flickable
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flickable
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flickable
 INSTALLS += target sources
 QT += widgets widgets

examples/embedded/flightinfo/flightinfo.pro

@@ -7,11 +7,11 @@ QT += network widgets
 
 symbian {
     TARGET.UID3 = 0xA000CF74
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.CAPABILITY = NetworkServices
 }
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flightinfo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flightinfo
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flightinfo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flightinfo
 INSTALLS += target sources

examples/embedded/lightmaps/lightmaps.pro

@@ -10,12 +10,12 @@ QT += network widgets
 
 symbian {
     TARGET.UID3 = 0xA000CF75
-    CONFIG += qt_demo
+    CONFIG += qt_example
     TARGET.CAPABILITY = NetworkServices
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/lightmaps
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/lightmaps
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps
 INSTALLS += target sources

examples/embedded/raycasting/raycasting.pro

@@ -4,11 +4,11 @@ RESOURCES += raycasting.qrc
 
 symbian {
     TARGET.UID3 = 0xA000CF76
-    CONFIG += qt_demo
+    CONFIG += qt_example
 }
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/raycasting
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/raycasting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/raycasting
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/raycasting
 INSTALLS += target sources
 QT += widgets widgets