diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-14 10:30:07 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-14 10:30:07 +0200 |
commit | 6af8b5e791a1bd07d6a477c0a80694dc08eae367 (patch) | |
tree | 6006f8b7ca3208f6704238f4681fb638390ee88a | |
parent | 49efea26a5fae8c2275999c36c7c8d24cf4125de (diff) | |
parent | b0dce506cc91c4b623eb323db7bbc18469e721c2 (diff) |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I0c7b3f4e8e464f23252f28df98eba507127731f5
-rwxr-xr-x | bin/syncqt.pl | 2 | ||||
-rw-r--r-- | dist/changes-5.11.2 | 58 | ||||
-rw-r--r-- | mkspecs/features/qt_build_paths.prf | 3 | ||||
-rw-r--r-- | mkspecs/features/qt_module_headers.prf | 4 |
4 files changed, 49 insertions, 18 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 8890b31770..77ce90c164 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -1111,7 +1111,7 @@ foreach my $lib (@modules_to_sync) { elsif (!$shadow) { $pri_install_pfiles.= "$pri_install_iheader ";; } - $pri_injections .= fixPaths($iheader, "$out_basedir/include/$lib") + $pri_injections .= fixPaths($iheader, $out_basedir) .":".($no_stamp ? "^" : "").fixPaths($oheader, "$out_basedir/include/$lib") .$injection." " if ($shadow); } diff --git a/dist/changes-5.11.2 b/dist/changes-5.11.2 index 5bb61339dd..acf8570e8e 100644 --- a/dist/changes-5.11.2 +++ b/dist/changes-5.11.2 @@ -18,10 +18,6 @@ Each of these identifiers can be entered in the bug tracker to obtain more information about a particular change. **************************************************************************** -* Qt 5.11.2 Changes * -**************************************************************************** - -**************************************************************************** * Licensing * **************************************************************************** @@ -32,9 +28,12 @@ information about a particular change. provided for builds from released branches of Qt. **************************************************************************** -* QtCore * +* Library * **************************************************************************** +QtCore +------ + - QFile: * [QTBUG-69417] Fixed a regression in QFile::copy() that caused the original file not to be copied entirely if it was modified outside of @@ -85,9 +84,8 @@ information about a particular change. prohibited Unicode codepoints to report isValid() == true, despite clearing the hostname. -**************************************************************************** -* QtGui * -**************************************************************************** +QtGui +----- - QMatrix: * The qHash() implementation for QMatrix has been changed. @@ -101,9 +99,10 @@ information about a particular change. * [QTBUG-70096] Fixed a possible crash when combining QStaticText, QOpenGLWidget and Qt Quick in the same application. -**************************************************************************** -* QtWidgets * -**************************************************************************** + - Qt programs in Flatpak environment can now trigger IBus input method. + +QtWidgets +--------- - QMessageBox: * [QTBUG-69526] A message box with two buttons, one of which is the "Show @@ -122,8 +121,39 @@ information about a particular change. - [QTBUG-69271] PCRE2 was updated to version 10.31. **************************************************************************** -* plugins * +* Tools * **************************************************************************** - - ibus: - * Qt programs in Flatpak environment can now trigger IBus input method. +configure & build system +------------------------ + + - [QTBUG-63452] Fixed re-configuring commercial builds after more than a day. + - [QTBUG-63483] Fixed -sysroot being ignored by various configure tests. + - [QTBUG-67443] Fixed build with some MinGW distributions. + - [QTBUG-69176] Fixed setting variables with digits in their names on + the configure command line. + - [MSVC][ICC] Fixed build with MSVC 2017 15.8. + - Fixed -L & -F being ignored by library configure tests. + - Added support for building with Wayland on macOS. + +qmake +----- + + - [QTBUG-22863][QTBUG-68635] Fixed support for file names containing colons + or hash marks - to a degree. + - [QTBUG-35713][Android@Win] Fixed building of static libraries with DESTDIR. + - [QTBUG-37592][Darwin] Switching the SDK version on an existing build will + now raise an error. + - [QTBUG-59967][VS2012+] Fixed handling of QMAKE_MANIFEST. + - [QTBUG-65072][Android@Win] Fixed inconsistent use of path separators in + generated dependencies with lead to build rules not being found. + - [QTBUG-69244][Xcode] Fixed shadow builds of SUBDIRS projects. + - [QTBUG-69279][Xcode] Fixed clobbering of build directory name in debug + builds of libraries with CONFIG+=create_prl when the path contains the + library name itself. + - [QTBUG-69770][VS] Fixed compilation of generated C++ sources with non-.cpp + file extensions. + - [QTBUG-69769][VS] Fixed QMAKE_EXTRA_COMPILERS for non-debug&release builds. + - [Darwin] Fixed QMAKE_BUNDLE not being used for the bundle identifier. + - Clang-based mkspecs now support CROSS_COMPILE. + - Added support for C++14/17 with MSVC 2017 15.7. diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf index 1848f00e90..3bb3823a8e 100644 --- a/mkspecs/features/qt_build_paths.prf +++ b/mkspecs/features/qt_build_paths.prf @@ -12,7 +12,8 @@ # Find the module's source root dir. isEmpty(_QMAKE_CONF_): error("Project has no top-level .qmake.conf file.") MODULE_BASE_INDIR = $$dirname(_QMAKE_CONF_) -MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_INDIR) +REAL_MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_INDIR) +MODULE_BASE_OUTDIR = $$REAL_MODULE_BASE_OUTDIR !isEmpty(MODULE_BASE_DIR): MODULE_SYNCQT_DIR = $$MODULE_BASE_DIR # compat for webkit isEmpty(MODULE_SYNCQT_DIR): MODULE_SYNCQT_DIR = $$MODULE_BASE_INDIR isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index bbded56b42..70d3520e5c 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -123,7 +123,7 @@ MODULE_INC_OUTDIR = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME isEmpty(MODULE_CFG_FILE): MODULE_CFG_FILE = qt$${MODULE}-config exists($$OUT_PWD/$${MODULE_CFG_FILE}.h) { - fwd_rel = $$relative_path($$OUT_PWD, $$MODULE_INC_OUTDIR) + fwd_rel = $$relative_path($$OUT_PWD, $$REAL_MODULE_BASE_OUTDIR) SYNCQT.INJECTIONS += \ $$fwd_rel/$${MODULE_CFG_FILE}.h:$${MODULE_CFG_FILE}.h \ $$fwd_rel/$${MODULE_CFG_FILE}_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/$${MODULE_CFG_FILE}_p.h @@ -131,7 +131,7 @@ exists($$OUT_PWD/$${MODULE_CFG_FILE}.h) { for (injection, SYNCQT.INJECTIONS) { injects = $$split(injection, :) - dst_hdr = $$absolute_path($$member(injects, 0), $$MODULE_INC_OUTDIR) + dst_hdr = $$absolute_path($$member(injects, 0), $$REAL_MODULE_BASE_OUTDIR) ofwd_hdr = $$member(injects, 1) fwd_hdr = $$replace(ofwd_hdr, ^\\^, ) MAIN_FWD = $$MODULE_INC_OUTDIR/$$fwd_hdr |