Merge integration refs/builds/qtci/dev/1617784151

CMakeLists.txt

@@ -71,6 +71,10 @@ if(NOT QT_BUILD_STANDALONE_TESTS)
     option(BUILD_SHARED_LIBS "Build Qt statically or dynamically" ON)
     set(QT_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 
+    # This variable is also set in Qt6CoreConfigExtras.cmake, but it's not loaded when building
+    # qtbase. Set it here so qt_add_plugin can compute the proper plugin flavor.
+    set(QT6_IS_SHARED_LIBS_BUILD ${BUILD_SHARED_LIBS})
+
     ## Should this Qt be built with Werror?
     option(WARNINGS_ARE_ERRORS "Build Qt with warnings as errors" ${FEATURE_developer_build})
 

cmake/QtPluginHelpers.cmake

@@ -23,8 +23,6 @@ endmacro()
 # A CMake target is created with the given target. The TYPE parameter is needed to place the
 # plugin into the correct plugins/ sub-directory.
 function(qt_internal_add_plugin target)
-    qt_internal_module_info(module "${target}")
-
     qt_internal_set_qt_known_plugins("${QT_KNOWN_PLUGINS}" "${target}")
 
     _qt_internal_get_add_plugin_keywords(
@@ -230,7 +228,7 @@ function(qt_internal_add_plugin target)
         "${CMAKE_CURRENT_SOURCE_DIR}"
         "${CMAKE_CURRENT_BINARY_DIR}"
          # For the syncqt headers
-        "$<BUILD_INTERFACE:${module_repo_include_dir}>"
+        "$<BUILD_INTERFACE:${QT_BUILD_DIR}/include>"
          ${arg_INCLUDE_DIRECTORIES}
     )
 

src/corelib/Qt6CTestMacros.cmake

@@ -114,10 +114,19 @@ function(_qt_internal_set_up_test_run_environment testname)
 endfunction()
 
 # Checks if the test project can be built successfully.
+#
+# TESTNAME: a custom test name to use instead of the one derived from the source directory name
+# BUILD_OPTIONS: a list of -D style CMake definitions to pass to ctest's --build-options (which
+#                are ultimately passed to the CMake invocation of the test project)
 macro(_qt_internal_test_expect_pass _dir)
-  cmake_parse_arguments(_ARGS "" "BINARY" "" ${ARGN})
+  cmake_parse_arguments(_ARGS "" "BINARY;TESTNAME" "BUILD_OPTIONS" ${ARGN})
+
+  if(_ARGS_TESTNAME)
+      set(testname "${_ARGS_TESTNAME}")
+  else()
       string(REPLACE "(" "_" testname "${_dir}")
       string(REPLACE ")" "_" testname "${testname}")
+  endif()
 
   set(__expect_pass__prefixes "${CMAKE_PREFIX_PATH}")
   string(REPLACE ";" "\;" __expect_pass__prefixes "${__expect_pass__prefixes}")
@@ -131,6 +140,7 @@ macro(_qt_internal_test_expect_pass _dir)
       --build-makeprogram "${CMAKE_MAKE_PROGRAM}"
       --build-project "${_dir}"
       --build-options "-DCMAKE_PREFIX_PATH=${__expect_pass__prefixes}" ${BUILD_OPTIONS_LIST}
+                      ${_ARGS_BUILD_OPTIONS}
       --test-command ${_ARGS_BINARY})
   add_test(${testname} ${CMAKE_CTEST_COMMAND} ${ctest_command_args})
   if(_ARGS_BINARY)

src/corelib/Qt6CoreMacros.cmake

@@ -1429,6 +1429,7 @@ endfunction()
 macro(_qt_internal_get_add_plugin_keywords option_args single_args multi_args)
     set(${option_args}
         STATIC
+        SHARED
     )
     set(${single_args}
         TYPE
@@ -1461,7 +1462,27 @@ function(qt6_add_plugin target)
         unset(arg_CLASSNAME)
     endif()
 
-    if (arg_STATIC OR NOT BUILD_SHARED_LIBS)
+    if(arg_STATIC AND arg_SHARED)
+        message(FATAL_ERROR
+            "Both STATIC and SHARED options were given. Only one of the two should be used."
+        )
+    endif()
+
+    # If no explicit STATIC/SHARED option is set, default to the flavor of the Qt build.
+    if(QT6_IS_SHARED_LIBS_BUILD)
+        set(create_static_plugin FALSE)
+    else()
+        set(create_static_plugin TRUE)
+    endif()
+
+    # Explicit option takes priority over the computed default.
+    if(arg_STATIC)
+        set(create_static_plugin TRUE)
+    elseif(arg_SHARED)
+        set(create_static_plugin FALSE)
+    endif()
+
+    if (create_static_plugin)
         add_library(${target} STATIC)
         target_compile_definitions(${target} PRIVATE QT_STATICPLUGIN)
     else()

src/corelib/io/qurl.h

@@ -130,7 +130,7 @@ public:
     };
 
     // encoding / toString values
-    enum UrlFormattingOption {
+    enum UrlFormattingOption : unsigned int {
         None = 0x0,
         RemoveScheme = 0x1,
         RemovePassword = 0x2,
@@ -147,7 +147,7 @@ public:
         NormalizePathSegments = 0x1000
     };
 
-    enum ComponentFormattingOption {
+    enum ComponentFormattingOption : unsigned int {
         PrettyDecoded = 0x000000,
         EncodeSpaces = 0x100000,
         EncodeUnicode = 0x200000,

src/corelib/kernel/qmetatype.cpp

@@ -518,7 +518,7 @@ int QMetaType::idHelper() const
 }
 
 /*!
-    \fn constexpr bool QMetaType::sizeOf() const
+    \fn constexpr qsizetype QMetaType::sizeOf() const
     \since 5.0
 
     Returns the size of the type in bytes (i.e. sizeof(T),

src/tools/androiddeployqt/main.cpp

@@ -1785,6 +1785,15 @@ bool readDependenciesFromElf(Options *options,
     return true;
 }
 
+QString defaultLibexecDir()
+{
+#ifdef Q_OS_WIN32
+    return QStringLiteral("bin");
+#else
+    return QStringLiteral("libexec");
+#endif
+}
+
 bool goodToCopy(const Options *options, const QString &file, QStringList *unmetDependencies);
 
 bool scanImports(Options *options, QSet<QString> *usedDependencies)
@@ -1985,7 +1994,8 @@ bool createRcc(const Options &options)
     if (!options.rccBinaryPath.isEmpty()) {
         rcc = options.rccBinaryPath;
     } else {
-        rcc = options.qtInstallDirectory + QLatin1String("/bin/rcc");
+        rcc = options.qtInstallDirectory + QLatin1Char('/') + defaultLibexecDir()
+            + QLatin1String("/rcc");
     }
 
 #if defined(Q_OS_WIN32)

src/widgets/styles/qfusionstyle.cpp

@@ -3045,9 +3045,6 @@ int QFusionStyle::pixelMetric(PixelMetric metric, const QStyleOption *option, co
     case PM_ListViewIconSize:
         val = 24;
         break;
-    case PM_LineEditIconSize:
-        val = 24;
-        break;
     case PM_DialogButtonsSeparator:
     case PM_ScrollBarSliderMin:
         val = 26;

tests/auto/cmake/CMakeLists.txt

@@ -226,3 +226,5 @@ _qt_internal_test_expect_pass(test_versionless_targets)
 
 _qt_internal_test_expect_pass(test_add_resources_binary_generated
                               BINARY test_add_resources_binary_generated)
+
+include(test_plugin_shared_static_flavor.cmake)

tests/auto/cmake/test_plugin_shared_static_flavor.cmake

@@ -0,0 +1,24 @@
+_qt_internal_test_expect_pass(test_plugin_shared_static_flavor
+                              TESTNAME test_plugin_flavor_static
+                              BUILD_OPTIONS
+                              "-DPLUGIN_OPTIONS=STATIC"
+                              "-DEXPECTED_PLUGIN_TARGET_TYPE=STATIC_LIBRARY")
+
+_qt_internal_test_expect_pass(test_plugin_shared_static_flavor
+                              TESTNAME test_plugin_flavor_shared
+                              BUILD_OPTIONS
+                              "-DPLUGIN_OPTIONS=SHARED"
+                              "-DEXPECTED_PLUGIN_TARGET_TYPE=MODULE_LIBRARY")
+
+if(QT6_IS_SHARED_LIBS_BUILD)
+    set(expected_plugin_target_type "MODULE_LIBRARY")
+else()
+    set(expected_plugin_target_type "STATIC_LIBRARY")
+endif()
+
+# Check default computed value when no explicit option is set.
+_qt_internal_test_expect_pass(test_plugin_shared_static_flavor
+                              TESTNAME test_plugin_flavor_derived_from_qt_type
+                              BUILD_OPTIONS
+                              "-DPLUGIN_OPTIONS="
+                              "-DEXPECTED_PLUGIN_TARGET_TYPE=${expected_plugin_target_type}")

tests/auto/cmake/test_plugin_shared_static_flavor/CMakeLists.txt

@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.14)
+
+project(test_plugin_flavor)
+
+if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/FindPackageHints.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/FindPackageHints.cmake")
+endif()
+
+find_package(Qt6Core REQUIRED HINTS ${Qt6Tests_PREFIX_PATH})
+
+qt6_add_plugin(test_plugin ${PLUGIN_OPTIONS})
+
+set(plugin_source_path "${CMAKE_CURRENT_BINARY_DIR}/plugin.cpp")
+file(GENERATE OUTPUT "${plugin_source_path}" CONTENT "int foo() {return 0;}")
+target_sources(test_plugin PRIVATE "${plugin_source_path}")
+
+get_target_property(plugin_target_type test_plugin TYPE)
+
+if(NOT EXPECTED_PLUGIN_TARGET_TYPE)
+    message(FATAL_ERROR "No value given for EXPECTED_PLUGIN_TARGET_TYPE variable")
+endif()
+
+if(NOT plugin_target_type STREQUAL "${EXPECTED_PLUGIN_TARGET_TYPE}")
+    set(info "")
+    list(APPEND info "PLUGIN_OPTIONS: ${PLUGIN_OPTIONS}")
+    list(APPEND info "QT6_IS_SHARED_LIBS_BUILD: ${QT6_IS_SHARED_LIBS_BUILD}")
+    list(APPEND info "EXPECTED_PLUGIN_TARGET_TYPE: ${EXPECTED_PLUGIN_TARGET_TYPE}")
+    list(JOIN info "\n" info)
+    message(FATAL_ERROR
+            "Computed plugin target type '${plugin_target_type}' did not match expected type '${EXPECTED_PLUGIN_TARGET_TYPE}'\n${info}")
+endif()