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

Change-Id: I84097f8e7b3b2128028bd7693c913d6968b82bfe

config_help.txt

@@ -1,8 +1,10 @@
 Usage:  configure [options] [assignments]
 
 Configure understands variable assignments like VAR=value on the command line.
-These override any values possibly obtained from pkg-config. The variables
-are mentioned in the descriptions of the options they relate to.
+Each uppercased library name (obtainable with -list-libraries) supports the
+suffixes _INCDIR, _LIBDIR, _PREFIX (INCDIR=PREFIX/include, LIBDIR=PREFIX/lib),
+_LIBS, and - on Windows and Darwin - _LIBS_DEBUG and _LIBS_RELEASE. E.g.,
+ICU_PREFIX=/opt/icu42 ICU_LIBS="-licui18n -licuuc -licudata".
 
 It is also possible to manipulate any QMAKE_* variable, to amend the values
 from the mkspec for the build of Qt itself, e.g., QMAKE_CXXFLAGS+=-g3.
@@ -62,6 +64,13 @@ Configure meta:
                          Use this after installing missing dependencies.
   -recheck-all ......... Discard all cached configure test results.
 
+  -feature-<feature> ... Enable <feature>
+  -no-feature-<feature>  Disable <feature> [none]
+  -list-features ....... List available features. Note that some features
+                         have dedicated command line options as well.
+
+  -list-libraries ...... List possible external dependencies.
+
 Build options:
 
   -opensource .......... Build the Open-Source Edition of Qt
@@ -188,9 +197,6 @@ Component selection:
                          [default on Android and Windows]
   -dbus-linked ......... Build Qt D-Bus and link to libdbus-1 [auto]
   -dbus-runtime ........ Build Qt D-Bus and dynamically load libdbus-1 [no]
-                         DBUS_PATH= DBUS_HOST_PATH=
-  -feature-<feature> ... Enable <feature>. The available features are described
-                         in src/corelib/global/qfeatures.txt. [all enabled]
   -accessibility ....... Enable accessibility support [yes]
                          Note: Disabling accessibility is not recommended.
   -qml-debug ........... Enable QML debugging support [yes]
@@ -210,7 +216,6 @@ Core options:
   -pcre ................ Select used libpcre2 [system/qt]
   -pps ................. Enable PPS support [auto] (QNX only)
   -zlib ................ Select used zlib [system/qt]
-                         ZLIB_LIBS=
 
   Logging backends:
     -journald .......... Enable journald support [no] (Unix only)
@@ -223,8 +228,6 @@ Network options:
   -no-openssl .......... Do not use OpenSSL [default on Apple and WinRT]
   -openssl-linked ...... Use OpenSSL and link to libssl [no]
   -openssl-runtime ..... Use OpenSSL and dynamically load libssl [auto]
-                         OPENSSL_PATH= OPENSSL_LIBS=, and on Windows also
-                         OPENSSL_LIBS_DEBUG= OPENSSL_LIBS_RELEASE=
   -securetransport ..... Use SecureTransport [auto] (Apple only)
 
   -sctp ................ Enable SCTP support [no]
@@ -292,5 +295,4 @@ Database options:
   -sql-<driver> ........ Enable SQL <driver> plugin. Supported drivers:
                          db2 ibase mysql oci odbc psql sqlite2 sqlite tds
                          [all auto]
-                         MYSQL_PATH= PSQL_LIBS= SYBASE= SYBASE_LIBS=
   -sqlite .............. Select used sqlite3 [system/qt]

configure.json

@@ -20,8 +20,7 @@
     "commandline": {
         "assignments": {
             "DBUS_HOST_PATH": "host_dbus.prefix",
-            "DBUS_PATH": "dbus.prefix",
-            "ZLIB_LIBS": "zlib.libs"
+            "DBUS_PATH": "dbus.prefix"
         },
         "custom": "qmakeArgs",
         "options": {
@@ -1016,7 +1015,10 @@
         },
         "qml-debug": {
             "label": "QML debugging",
-            "output": [ { "type": "publicQtConfig", "negative": true } ]
+            "output": [
+                "privateFeature",
+                { "type": "publicQtConfig", "negative": true }
+            ]
         },
         "compile_examples": {
             "label": "Compile examples",

examples/network/network.pro

@@ -30,7 +30,6 @@ qtHaveModule(widgets) {
     }
 
     qtConfig(openssl): SUBDIRS += securesocketclient
-    qtConfig(openssl-linked): SUBDIRS += securesocketclient
     qtConfig(sctp): SUBDIRS += multistreamserver multistreamclient
 }
 

examples/widgets/widgets/tablet/tabletcanvas.cpp

@@ -67,6 +67,7 @@ TabletCanvas::TabletCanvas()
     resize(500, 500);
     initPixmap();
     setAutoFillBackground(true);
+    setAttribute(Qt::WA_TabletTracking);
 }
 
 void TabletCanvas::initPixmap()

mkspecs/features/data/configure.json

@@ -12,7 +12,10 @@
             "recheck": { "type": "void", "name": "cache_use", "value": "positive" },
             "recheck-all": { "type": "void", "name": "cache_use", "value": "none" },
 
-            "redo": { "type": "redo" }
+            "redo": { "type": "redo" },
+
+            "list-features": "void",
+            "list-libraries": "void"
         }
     }
 }

mkspecs/features/moc.prf

@@ -27,7 +27,7 @@ win32:count(MOC_INCLUDEPATH, 40, >) {
 # QNX's compiler sets "gcc" config, but does not support the -dM option;
 # UIKit builds are always multi-arch due to simulator_and_device (unless
 # -sdk is used) so this feature cannot possibly work.
-if(gcc|intel_icl|msvc):!rim_qcc:!uikit:if(!macos|count(QMAKE_APPLE_DEVICE_ARCHS, 1)) {
+if(gcc|intel_icl|msvc):!rim_qcc:!uikit:!no_moc_predefs:if(!macos|count(QMAKE_APPLE_DEVICE_ARCHS, 1)) {
     moc_predefs.name = "Generate moc_predefs.h"
     moc_predefs.CONFIG = no_link
     gcc:            moc_predefs.commands = $$QMAKE_CXX $$QMAKE_CXXFLAGS -dM -E -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}

mkspecs/features/qmake_use.prf

@@ -5,25 +5,19 @@ for(ever) {
         use = $$split(use, /)
         name = $$take_first(use)
         nu = $$upper($$name)
-        debug: \
-            libs = $$eval(QMAKE_LIBS_$${nu}_DEBUG)
-        else: \
-            libs = $$eval(QMAKE_LIBS_$${nu}_RELEASE)
-        libs += $$eval(QMAKE_LIBS_$$nu)
-        libdir = $$eval(QMAKE_LIBDIR_$$nu)
-        defines = $$eval(QMAKE_DEFINES_$${nu})
-        includes = $$eval(QMAKE_INCDIR_$${nu})
-
-        isEmpty(libs):isEmpty(defines):isEmpty(includes): \
+        !defined(QMAKE_LIBS_$$nu, var): \
             error("Library '$$name' is not defined.")
 
         !contains(use, nolink) {
-            QMAKE_LIBDIR += $$libdir
-            LIBS$${suffix} += $$libs
+            QMAKE_LIBDIR += $$eval(QMAKE_LIBDIR_$$nu)
+            debug: \
+                LIBS$${suffix} += $$eval(QMAKE_LIBS_$${nu}_DEBUG) $$eval(QMAKE_LIBS_$$nu)
+            else: \
+                LIBS$${suffix} += $$eval(QMAKE_LIBS_$${nu}_RELEASE) $$eval(QMAKE_LIBS_$$nu)
         }
         !contains(use, linkonly) {
-            DEFINES += $$defines
-            INCLUDEPATH += $$includes
+            DEFINES += $$eval(QMAKE_DEFINES_$${nu})
+            INCLUDEPATH += $$eval(QMAKE_INCDIR_$${nu})
         }
     }
     !isEmpty(suffix): break()