Merge remote-tracking branch 'origin/4.12'

Change-Id: I0935f0087efc1ddd4f17fcafc2e3b5c58c23bef4

dist/changes-4.12.3.md

@@ -0,0 +1,62 @@
+Qt Creator 4.12.3
+=================
+
+Qt Creator version 4.12.3 contains bug fixes.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline origin/v4.12.2..v4.12.3
+
+Editing
+-------
+
+* Fixed missing update of completions after cursor navigation (QTCREATORBUG-24071)
+
+### QML
+
+* Fixed line number for string literals (QTCREATORBUG-23777)
+
+### GLSL
+
+* Fixed freeze (QTCREATORBUG-24070)
+
+Projects
+--------
+
+### CMake
+
+* Fixed issue with `Add build library search path` and older CMake versions (QTCREATORBUG-23997)
+* Fixed that projects without name were considered invalid (QTCREATORBUG-24044)
+
+Debugging
+---------
+
+* Fixed QDateTime pretty printer for Qt 5.14 and newer
+* Fixed QJson pretty printer for Qt 5.15 and newer (QTCREATORBUG-23827)
+
+Platforms
+---------
+
+### Android
+
+* Fixed that installing OpenSSL for Android in the settings could delete current working directory
+  (QTCREATORBUG-24173)
+
+### MCU
+
+* Fixed issue with saving settings (QTCREATORBUG-24048)
+
+Credits for these changes go to:
+--------------------------------
+Alessandro Portale  
+André Pönitz  
+Assam Boudjelthia  
+Christian Stenger  
+Cristian Adam  
+David Schulz  
+Eike Ziller  
+Leena Miettinen  
+Tobias Hunger  

src/plugins/bineditor/bineditorwidget.cpp

@@ -613,7 +613,6 @@ int BinEditorWidget::dataIndexOf(const QByteArray &pattern, qint64 from, bool ca
 
     QByteArray buffer;
     buffer.resize(m_blockSize + trailing);
-    char *b = buffer.data();
     QByteArrayMatcher matcher(pattern);
 
     qint64 block = from / m_blockSize;
@@ -622,6 +621,7 @@ int BinEditorWidget::dataIndexOf(const QByteArray &pattern, qint64 from, bool ca
         if (!requestDataAt(block * m_blockSize))
             return -1;
         QByteArray data = blockData(block);
+        char *b = buffer.data();
         ::memcpy(b, b + m_blockSize, trailing);
         ::memcpy(b + trailing, data.constData(), m_blockSize);
 
@@ -645,7 +645,6 @@ int BinEditorWidget::dataLastIndexOf(const QByteArray &pattern, qint64 from, boo
 
     QByteArray buffer;
     buffer.resize(m_blockSize + trailing);
-    char *b = buffer.data();
 
     if (from == -1)
         from = m_size;
@@ -655,6 +654,7 @@ int BinEditorWidget::dataLastIndexOf(const QByteArray &pattern, qint64 from, boo
         if (!requestDataAt(qint64(block) * m_blockSize))
             return -1;
         QByteArray data = blockData(block);
+        char *b = buffer.data();
         ::memcpy(b + m_blockSize, b, trailing);
         ::memcpy(b, data.constData(), m_blockSize);
 

tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv

@@ -5720,33 +5720,6 @@
 "clangcodemodel.qbs:112"	"4"
 "data"	"4"
 "clangtestdata.qrc"	"5"
-"/unittests/ClangCodeModel"	"6"
-"exampleIncludeDir"	"7"
-"mylib"	"8"
-"mylib.h"	"9"
-"file.h"	"8"
-"otherFile.h"	"8"
-"qt-widgets-app"	"7"
-"main.cpp"	"8"
-"mainwindow.cpp"	"8"
-"mainwindow.h"	"8"
-"mainwindow.ui"	"8"
-"qt-widgets-app.pro"	"8"
-"completionWithProject.cpp"	"7"
-"constructorCompletion.cpp"	"7"
-"dotToArrowCorrection.cpp"	"7"
-"doxygenKeywordsCompletion.cpp"	"7"
-"functionCompletion.cpp"	"7"
-"globalCompletion.cpp"	"7"
-"includeDirectiveCompletion.cpp"	"7"
-"memberCompletion.cpp"	"7"
-"myheader.h"	"7"
-"mysource.cpp"	"7"
-"noDotToArrowCorrectionForFloats.cpp"	"7"
-"objc_messages_1.mm"	"7"
-"objc_messages_2.mm"	"7"
-"objc_messages_3.mm"	"7"
-"preprocessorKeywordsCompletion.cpp"	"7"
 "clangautomationutils.cpp"	"4"
 "clangautomationutils.h"	"4"
 "clangbatchfileprocessor.cpp"	"4"
@@ -5975,36 +5948,6 @@
 "clangtoolsunittests.cpp"	"4"
 "clangtoolsunittests.h"	"4"
 "clangtoolsunittests.qrc"	"4"
-"/"	"5"
-"unit-tests"	"6"
-"clangtidy_clazy"	"7"
-"clangtidy_clazy.pro"	"8"
-"clazy_example.cpp"	"8"
-"tidy_example.cpp"	"8"
-"qt-essential-includes"	"7"
-"main.cpp"	"8"
-"qt-essential-includes.pro"	"8"
-"qt-essential-includes.qbs"	"8"
-"qt-widgets-app"	"7"
-"main.cpp"	"8"
-"mainwindow.cpp"	"8"
-"mainwindow.h"	"8"
-"mainwindow.ui"	"8"
-"qt-widgets-app.pro"	"8"
-"qt-widgets-app.qbs"	"8"
-"simple"	"7"
-"main.cpp"	"8"
-"simple.pro"	"8"
-"simple.qbs"	"8"
-"simple-library"	"7"
-"simple-library.cpp"	"8"
-"simple-library.h"	"8"
-"simple-library.pro"	"8"
-"simple-library.qbs"	"8"
-"stdc++11-includes"	"7"
-"main.cpp"	"8"
-"stdc++11-includes.pro"	"8"
-"stdc++11-includes.qbs"	"8"
 "clangfileinfo.h"	"3"
 "clangfixitsrefactoringchanges.cpp"	"3"
 "clangfixitsrefactoringchanges.h"	"3"