Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
luchuan0 · Oct 14, 2019 · 4402866 · 4402866
2 parents 1e27ad1 + e164d61
commit 4402866
Show file tree

Hide file tree

Showing 893 changed files with 28,159 additions and 21,414 deletions.
diff --git a/config.tests/x86_simd/main.cpp b/config.tests/x86_simd/main.cpp
@@ -132,6 +132,23 @@ attribute_target("rdrnd") int test_rdrnd()
 }
 #endif
 
+#if T(RDSEED)
+attribute_target("rdseed") int test_rdseed()
+{
+    unsigned short us;
+    unsigned int ui;
+    if (_rdseed16_step(&us))
+        return 1;
+    if (_rdseed32_step(&ui))
+        return 1;
+#  if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
+    unsigned long long ull;
+    if (_rdseed64_step(&ull))
+        return 1;
+#  endif
+}
+#endif
+
 #if T(SHANI)
 attribute_target("sha") void test_shani()
 {

diff --git a/config_help.txt b/config_help.txt
@@ -38,8 +38,7 @@ except -sysconfdir should be located under -prefix/-hostprefix:
   -plugindir <dir> ...... Plugins [ARCHDATADIR/plugins]
   -libexecdir <dir> ..... Helper programs [ARCHDATADIR/bin on Windows,
                           ARCHDATADIR/libexec otherwise]
-  -importdir <dir> ...... QML1 imports [ARCHDATADIR/imports]
-  -qmldir <dir> ......... QML2 imports [ARCHDATADIR/qml]
+  -qmldir <dir> ......... QML imports [ARCHDATADIR/qml]
   -datadir <dir> ........ Arch-independent data [PREFIX]
   -docdir <dir> ......... Documentation [DATADIR/doc]
   -translationdir <dir> . Translations [DATADIR/translations]
@@ -281,6 +280,7 @@ Gui, printing, widget options:
                          es2 (default on Windows), desktop (default on Unix),
                          dynamic (Windows only)
   -opengles3 ........... Enable OpenGL ES 3.x support instead of ES 2.x [auto]
+  -egl ................. Enable EGL support [auto]
   -angle ............... Use bundled ANGLE to support OpenGL ES 2.0 [auto]
                          (Windows only)
   -combined-angle-lib .. Merge LibEGL and LibGLESv2 into LibANGLE (Windows only)

diff --git a/configure b/configure
@@ -497,7 +497,6 @@ while [ "$#" -gt 0 ]; do
     -docdir| \
     -headerdir| \
     -plugindir| \
-    -importdir| \
     -qmldir| \
     -archdatadir| \
     -datadir| \

diff --git a/configure.json b/configure.json
@@ -40,7 +40,6 @@
             "hostbindir": "string",
             "hostdatadir": "string",
             "hostlibdir": "string",
-            "importdir": "string",
             "libdir": "string",
             "libexecdir": "string",
             "plugindir": "string",
@@ -222,6 +221,21 @@
                 { "type": "pkgConfig", "args": "libudev" },
                 "-ludev"
             ]
+        },
+        "libdl": {
+            "label": "dlopen()",
+            "test": {
+                "main": [
+                    "dlclose(dlopen(0, 0));",
+                    "dlsym(RTLD_DEFAULT, 0);",
+                    "dlerror();"
+                ]
+            },
+            "headers": "dlfcn.h",
+            "sources": [
+                "",
+                "-ldl"
+            ]
         }
     },
 
@@ -321,13 +335,13 @@
                 "qmake": "CONFIG += c++11 c++14"
             }
         },
-        "c++1z": {
+        "c++17": {
             "label": "C++17 support",
             "type": "compile",
             "test": {
                 "head": [
                     "#if __cplusplus > 201402L",
-                    "// Compiler claims to support experimental C++1z, trust it",
+                    "// Compiler claims to support C++17, trust it",
                     "#else",
                     "#  error __cplusplus must be > 201402L (the value for C++14)",
                     "#endif",
@@ -339,7 +353,7 @@
                     "int i = std::get<int>(v);",
                     "std::visit([](const auto &) { return 1; }, v);"
                 ],
-                "qmake": "CONFIG += c++11 c++14 c++1z"
+                "qmake": "CONFIG += c++11 c++14 c++17"
             }
         },
         "c++2a": {
@@ -353,7 +367,7 @@
                     "#  error __cplusplus must be > 201703L (the value for C++17)",
                     "#endif"
                 ],
-                "qmake": "CONFIG += c++11 c++14 c++1z c++2a"
+                "qmake": "CONFIG += c++11 c++14 c++17 c++2a"
             }
         },
         "precompile_header": {
@@ -469,6 +483,17 @@
                 ]
             }
         },
+        "signaling_nan": {
+            "label": "Signaling NaN for doubles",
+            "type": "compile",
+            "test": {
+                "head": [ "#include <limits>" ],
+                "main": [
+                    "using B = std::numeric_limits<double>;",
+                    "static_assert(B::has_signaling_NaN, \"System lacks signaling NaN\");"
+                ]
+            }
+        },
         "sse2": {
             "label": "SSE2 instructions",
             "type": "x86Simd"
@@ -501,6 +526,10 @@
             "label": "RDRAND instruction",
             "type": "x86Simd"
         },
+        "rdseed": {
+            "label": "RDSEED instruction",
+            "type": "x86Simd"
+        },
         "shani": {
             "label": "SHA new instructions",
             "type": "x86Simd"
@@ -751,7 +780,7 @@
         "debug_and_release": {
             "label": "Compile libs in debug and release mode",
             "autoDetect": "input.debug == ''",
-            "condition": "config.darwin || config.win32",
+            "condition": "config.darwin || (config.win32 && !config.gcc)",
             "output": [ "publicFeature", "publicQtConfig", "debugAndRelease" ]
         },
         "force_debug_info": {
@@ -792,6 +821,7 @@
         "rpath": {
             "label": "Build with RPATH",
             "autoDetect": "var.QMAKE_LFLAGS_RPATH != '' && features.shared",
+            "condition": "!config.android",
             "output": [ "publicFeature", "publicQtConfig" ]
         },
         "rpath_dir": {
@@ -924,15 +954,20 @@
             "condition": "features.c++11 && tests.c++14",
             "output": [ "publicFeature", "publicQtConfig" ]
         },
+        "c++17": {
+            "label": "C++17",
+            "condition": "features.c++14 && tests.c++17",
+            "output": [ "publicFeature", "publicQtConfig" ]
+        },
         "c++1z": {
             "label": "C++17",
-            "condition": "features.c++14 && tests.c++1z",
+            "condition": "features.c++17",
             "output": [ "publicFeature", "publicQtConfig" ]
         },
         "c++2a": {
             "label": "C++2a",
             "autoDetect": false,
-            "condition": "features.c++1z && tests.c++2a",
+            "condition": "features.c++17 && tests.c++2a",
             "output": [ "publicFeature", "publicQtConfig" ]
         },
         "c89": {
@@ -990,6 +1025,11 @@
                 { "type": "define", "name": "QT_REDUCE_RELOCATIONS" }
             ]
         },
+        "signaling_nan": {
+            "label": "Signaling NaN",
+            "condition": "tests.signaling_nan",
+            "output": [ "publicFeature" ]
+        },
         "sse2": {
             "label": "SSE2",
             "condition": "(arch.i386 || arch.x86_64) && tests.sse2",
@@ -1144,6 +1184,14 @@
                 { "type": "define", "name": "QT_COMPILER_SUPPORTS_RDRND", "value": 1 }
             ]
         },
+        "rdseed": {
+            "label": "RDSEED",
+            "condition": "tests.rdseed",
+            "output": [
+                "privateConfig",
+                { "type": "define", "name": "QT_COMPILER_SUPPORTS_RDSEED", "value": 1 }
+            ]
+        },
         "shani": {
             "label": "SHA",
             "condition": "features.sse2 && tests.shani",
@@ -1340,6 +1388,17 @@
             "autoDetect": false,
             "condition": "!features.shared",
             "output": [ "publicConfig", "publicQtConfig" ]
+        },
+        "dlopen": {
+            "label": "dlopen()",
+            "condition": "config.unix && libs.libdl",
+            "output": [ "privateFeature" ]
+        },
+        "relocatable": {
+            "label": "Relocatable",
+            "autoDetect": "features.shared",
+            "condition": "features.dlopen || config.win32 || !features.shared",
+            "output": [ "privateFeature" ]
         }
     },
 
@@ -1438,7 +1497,7 @@
                 {
                     "message": "Using C++ standard",
                     "type": "firstAvailableFeature",
-                    "args": "c++2a c++1z c++14 c++11"
+                    "args": "c++2a c++17 c++14 c++11"
                 },
                 {
                     "type": "feature",
@@ -1461,6 +1520,7 @@
                     "args": "enable_gdb_index",
                     "condition": "config.gcc && !config.clang && (features.debug || features.force_debug_info || features.debug_and_release)"
                 },
+                "relocatable",
                 "precompile_header",
                 "ltcg",
                 {

diff --git a/configure.pri b/configure.pri
@@ -699,7 +699,6 @@ defineReplace(printInstallPaths) {
         $$printInstallPath(LibraryExecutables, libexecdir, $$DEFAULT_LIBEXEC) \
         $$printInstallPath(Binaries, bindir, bin) \
         $$printInstallPath(Plugins, plugindir, plugins) \
-        $$printInstallPath(Imports, importdir, imports) \
         $$printInstallPath(Qml2Imports, qmldir, qml) \
         $$printInstallPath(ArchData, archdatadir, .) \
         $$printInstallPath(Data, datadir, .) \
@@ -763,6 +762,11 @@ defineTest(qtConfOutput_preparePaths) {
         have_hostprefix = true
     }
 
+    equals(config.input.prefix, $$config.input.extprefix): \
+        qmake_crossbuild = false
+    else: \
+        qmake_crossbuild = true
+
     PREFIX_COMPLAINTS =
     PREFIX_REMINDER = false
     win32: \
@@ -789,7 +793,6 @@ defineTest(qtConfOutput_preparePaths) {
         archdata_pfx = $$config.rel_input.archdatadir/
     processQtPath("", libexecdir, $${archdata_pfx}$$DEFAULT_LIBEXEC)
     processQtPath("", plugindir, $${archdata_pfx}plugins)
-    processQtPath("", importdir, $${archdata_pfx}imports)
     processQtPath("", qmldir, $${archdata_pfx}qml)
     processQtPath("", sysconfdir, $$DEFAULT_SYSCONFDIR)
     $$have_hostprefix {
@@ -802,6 +805,18 @@ defineTest(qtConfOutput_preparePaths) {
         processQtPath(host, hostdatadir, $$config.rel_input.archdatadir)
     }
 
+    win32:$$qtConfEvaluate("features.shared") {
+        # Windows DLLs are in the bin dir.
+        libloc_absolute_path = $$absolute_path($$config.rel_input.bindir, $$config.input.prefix)
+    } else {
+        libloc_absolute_path = $$absolute_path($$config.rel_input.libdir, $$config.input.prefix)
+    }
+    config.input.liblocation_to_prefix = $$relative_path($$config.input.prefix, $$libloc_absolute_path)
+
+    hostbindir_absolute_path = $$absolute_path($$config.rel_input.hostbindir, $$config.input.hostprefix)
+    config.input.hostbindir_to_hostprefix = $$relative_path($$config.input.hostprefix, $$hostbindir_absolute_path)
+    config.input.hostbindir_to_extprefix = $$relative_path($$config.input.extprefix, $$hostbindir_absolute_path)
+
     !isEmpty(PREFIX_COMPLAINTS) {
         PREFIX_COMPLAINTS = "$$join(PREFIX_COMPLAINTS, "$$escape_expand(\\n)Note: ")"
         $$PREFIX_REMINDER: \
@@ -821,7 +836,6 @@ defineTest(qtConfOutput_preparePaths) {
     addConfStr($$config.rel_input.libexecdir)
     addConfStr($$config.rel_input.bindir)
     addConfStr($$config.rel_input.plugindir)
-    addConfStr($$config.rel_input.importdir)
     addConfStr($$config.rel_input.qmldir)
     addConfStr($$config.rel_input.archdatadir)
     addConfStr($$config.rel_input.datadir)
@@ -843,9 +857,6 @@ defineTest(qtConfOutput_preparePaths) {
     addConfStr($$[QMAKE_SPEC])
 
     $${currentConfig}.output.qconfigSource = \
-        "/* Installation date */" \
-        "static const char qt_configure_installation     [12+11]  = \"qt_instdate=2012-12-20\";" \
-        "" \
         "/* Installation Info */" \
         "static const char qt_configure_prefix_path_str  [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \
         "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
@@ -867,9 +878,13 @@ defineTest(qtConfOutput_preparePaths) {
         ";" \
         "" \
         "$${LITERAL_HASH}define QT_CONFIGURE_SETTINGS_PATH \"$$config.rel_input.sysconfdir\"" \
+        "$${LITERAL_HASH}define QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH \"$$config.input.liblocation_to_prefix\"" \
+        "$${LITERAL_HASH}define QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH \"$$config.input.hostbindir_to_extprefix\"" \
+        "$${LITERAL_HASH}define QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH \"$$config.input.hostbindir_to_hostprefix\"" \
         "" \
         "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
         "$${LITERAL_HASH} define QT_CONFIGURE_SYSROOTIFY_PREFIX $$qmake_sysrootify" \
+        "$${LITERAL_HASH} define QT_CONFIGURE_CROSSBUILD $$qmake_crossbuild" \
         "$${LITERAL_HASH}endif" \
         "" \
         "$${LITERAL_HASH}define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12" \