Partial compile fix for current Qt dev and/or Qt 6

This does not cover Utils::MapReduceOption with QVector, and code
that's not compiled on my machine.

Change-Id: Ib63923985c52b1bb74e5ec2068a2bb37469ac618
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-11-12 10:26:38 +01:00
parent 817f81cbfd
commit 0120e462b2
27 changed files with 45 additions and 36 deletions

View File

@@ -25,7 +25,7 @@
#pragma once
#include <QtGlobal>
#include <QList>
QT_BEGIN_NAMESPACE
class QString;

View File

@@ -27,9 +27,7 @@
#include "cpptools_global.h"
QT_BEGIN_NAMESPACE
template <class> class QList;
QT_END_NAMESPACE
#include <QList>
namespace CPlusPlus {
class Class;

View File

@@ -92,8 +92,10 @@ QString StringTablePrivate::insert(const QString &string)
if (string.isEmpty())
return string;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#ifndef QT_NO_UNSHARABLE_CONTAINERS
QTC_ASSERT(const_cast<QString&>(string).data_ptr()->ref.isSharable(), return string);
#endif
#endif
m_stopGCRequested.fetchAndStoreAcquire(true);