From 825f98815683faea06144ab0262129b0367798ee Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Tue, 2 Oct 2018 12:59:24 +0200
Subject: Modernize the "textcodec" feature

Also clean up QTextCodec usage in qmake build and some includes
of qtextcodec.h.

Change-Id: I0475b82690024054add4e85a8724c8ea3adcf62a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 qmake/library/qmakevfs.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'qmake/library/qmakevfs.cpp')

diff --git a/qmake/library/qmakevfs.cpp b/qmake/library/qmakevfs.cpp
index 2239a2beec..265f1e60d3 100644
--- a/qmake/library/qmakevfs.cpp
+++ b/qmake/library/qmakevfs.cpp
@@ -35,7 +35,7 @@ using namespace QMakeInternal;
 #include <qfile.h>
 #include <qfileinfo.h>
 
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
 #include <qtextcodec.h>
 #endif
 
@@ -49,7 +49,7 @@ QMakeVfs::QMakeVfs()
     , m_magicExisting(fL1S("existing"))
 #endif
 {
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
     m_textCodec = 0;
 #endif
 }
@@ -219,7 +219,7 @@ QMakeVfs::ReadResult QMakeVfs::readFile(int id, QString *contents, QString *errS
         return ReadOtherError;
     }
     *contents =
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
         m_textCodec ? m_textCodec->toUnicode(bcont) :
 #endif
         QString::fromLocal8Bit(bcont);
@@ -273,7 +273,7 @@ void QMakeVfs::invalidateContents()
 }
 #endif
 
-#ifndef QT_NO_TEXTCODEC
+#if QT_CONFIG(textcodec)
 void QMakeVfs::setTextCodec(const QTextCodec *textCodec)
 {
     m_textCodec = textCodec;
-- 
cgit v1.2.3


From 1f998e040eb7202691f4a4eb5fb77499247b2aab Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 27 Nov 2018 09:39:56 +0100
Subject: Fix crash in qmake parsing

The read from a QHash needs to be protected too if other threads are
writing.

sync-up with qtc, no actual effect on qmake itself.

Fixes: QTCREATORBUG-21416
Change-Id: I75e5634e11b10056d6dbb6fdceef482ca2222ca1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from qtcreator/5f79b5d2e5e33321cdcd00362f0d6d9442a73ec2)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 qmake/library/qmakevfs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'qmake/library/qmakevfs.cpp')

diff --git a/qmake/library/qmakevfs.cpp b/qmake/library/qmakevfs.cpp
index 9fd6ae470c..1f77595535 100644
--- a/qmake/library/qmakevfs.cpp
+++ b/qmake/library/qmakevfs.cpp
@@ -109,10 +109,10 @@ int QMakeVfs::idForFileName(const QString &fn, VfsFlags flags)
             return id;
     }
 #endif
-    if (!(flags & VfsAccessedOnly)) {
 #ifdef PROPARSER_THREAD_SAFE
-        QMutexLocker locker(&s_mutex);
+    QMutexLocker locker(&s_mutex);
 #endif
+    if (!(flags & VfsAccessedOnly)) {
         int &id = s_fileIdMap[fn];
         if (!id) {
             id = ++s_fileIdCounter;
-- 
cgit v1.2.3