Qt6 upgrade

Internal/TargetConfig.pri

@@ -4,7 +4,7 @@ isEmpty(QTNPROPERTY_BIN) {
 
 DESTDIR = $$QTNPROPERTY_BIN
 
-CONFIG += c++11
+CONFIG += c++17
 
 msvc {
     DEFINES += _CRT_SECURE_NO_WARNINGS

QtnProperty/Auxiliary/PropertyAux.h

@@ -61,6 +61,7 @@ enum QtnPropertyChangeReasonFlag
 	QtnPropertyChangeReasonMultiEdit = 0x1000,
 	QtnPropertyChangeReasonLockToggled = 0x2000,
 	QtnPropertyChangeReasonUpdateDelegate = 0x4000,
+    QtnPropertyChangeReasonNewAttribute = 0x8000,
 	QtnPropertyChangeReasonState = QtnPropertyChangeReasonStateLocal |
 		QtnPropertyChangeReasonStateInherited,
 	QtnPropertyChangeReasonChildren = QtnPropertyChangeReasonChildPropertyAdd |

QtnProperty/Auxiliary/PropertyTemplates.h

@@ -177,7 +177,7 @@ class QtnSinglePropertyBase : public QtnProperty
 
 	virtual bool toVariantImpl(QVariant &var) const override
 	{
-		var.setValue<ValueTypeStore>(value());
+        var.setValue(value());
 		return var.isValid();
 	}
 

QtnProperty/Core/PropertyEnumFlags.cpp

@@ -16,6 +16,7 @@ limitations under the License.
 *******************************************************************************/
 
 #include "PropertyEnumFlags.h"
+#include <QRegularExpression>
 
 QtnPropertyEnumFlagsBase::QtnPropertyEnumFlagsBase(QObject *parent)
 	: QtnSinglePropertyBase<QtnEnumFlagsValueType>(parent)
@@ -34,12 +35,13 @@ bool QtnPropertyEnumFlagsBase::fromStrImpl(
 
 	if (!enumStr.isEmpty() && enumStr != "0")
 	{
-		static QRegExp parserEnumFlags(
-			QStringLiteral("^\\s*([^|\\s]+)\\s*\\|(.+)$"), Qt::CaseInsensitive);
+        static QRegularExpression parserEnumFlags(
+            QStringLiteral("^\\s*([^|\\s]+)\\s*\\|(.+)$"), QRegularExpression::CaseInsensitiveOption);
 
-		while (parserEnumFlags.exactMatch(enumStr))
+        QRegularExpressionMatch match = parserEnumFlags.match(enumStr);
+        while (match.hasMatch())
 		{
-			QStringList params = parserEnumFlags.capturedTexts();
+            QStringList params = match.capturedTexts();
 
 			if (params.size() != 3)
 				return false;
@@ -52,6 +54,7 @@ bool QtnPropertyEnumFlagsBase::fromStrImpl(
 			val = val | enumValue->value();
 
 			enumStr = params[2];
+            match = parserEnumFlags.match(enumStr);
 		}
 
 		const QtnEnumValueInfo *enumValue = m_enumInfo->fromStr(enumStr);

QtnProperty/Core/PropertyQPoint.cpp

@@ -16,6 +16,7 @@ limitations under the License.
 *******************************************************************************/
 
 #include "PropertyQPoint.h"
+#include <QRegularExpression>
 
 QtnPropertyQPointBase::QtnPropertyQPointBase(QObject *parent)
 	: ParentClass(parent)
@@ -39,24 +40,26 @@ QtnProperty *QtnPropertyQPointBase::createYProperty()
 bool QtnPropertyQPointBase::fromStrImpl(
 	const QString &str, QtnPropertyChangeReason reason)
 {
-	static QRegExp parserPoint(
-		"^\\s*QPoint\\s*\\(([^\\)]+)\\)\\s*$", Qt::CaseInsensitive);
+    static QRegularExpression parserPoint(
+        "^\\s*QPoint\\s*\\(([^\\)]+)\\)\\s*$", QRegularExpression::CaseInsensitiveOption);
 
-	if (!parserPoint.exactMatch(str))
+    QRegularExpressionMatch match = parserPoint.match(str);
+    if (!match.hasMatch())
 		return false;
 
-	QStringList params = parserPoint.capturedTexts();
+    QStringList params = match.capturedTexts();
 
 	if (params.size() != 2)
 		return false;
 
-	static QRegExp parserParams(
-		"^\\s*(-?\\d+)\\s*,\\s*(-?\\d+)\\s*$", Qt::CaseInsensitive);
+    static QRegularExpression parserParams(
+        "^\\s*(-?\\d+)\\s*,\\s*(-?\\d+)\\s*$", QRegularExpression::CaseInsensitiveOption);
 
-	if (!parserParams.exactMatch(params[1]))
+    match = parserPoint.match(params[1]);
+    if (!match.hasMatch())
 		return false;
 
-	params = parserParams.capturedTexts();
+    params = match.capturedTexts();
 
 	if (params.size() != 3)
 		return false;

QtnProperty/Core/PropertyQPointF.cpp

@@ -16,8 +16,8 @@ limitations under the License.
 *******************************************************************************/
 
 #include "PropertyQPointF.h"
-
 #include "PropertyQPoint.h"
+#include <QRegularExpression>
 
 QtnPropertyQPointFBase::QtnPropertyQPointFBase(QObject *parent)
 	: ParentClass(parent)
@@ -59,26 +59,28 @@ QString QtnPropertyQPointFBase::getYDescriptionFormat() const
 bool QtnPropertyQPointFBase::fromStrImpl(
 	const QString &str, QtnPropertyChangeReason reason)
 {
-	static QRegExp parserPoint(
+    static QRegularExpression parserPoint(
 		QLatin1String("^\\s*QPointF\\s*\\(([^\\)]+)\\)\\s*$"),
-		Qt::CaseInsensitive);
+        QRegularExpression::CaseInsensitiveOption);
 
-	if (!parserPoint.exactMatch(str))
+    QRegularExpressionMatch match = parserPoint.match(str);
+    if (!match.hasMatch())
 		return false;
 
-	QStringList params = parserPoint.capturedTexts();
+    QStringList params = match.capturedTexts();
 
 	if (params.size() != 2)
 		return false;
 
-	static QRegExp parserParams(
+    static QRegularExpression parserParams(
 		"^\\s*(\\-?\\d+(\\.\\d{0,})?)\\s*,\\s*(\\-?\\d+(\\.\\d{0,})?)\\s*$",
-		Qt::CaseInsensitive);
+        QRegularExpression::CaseInsensitiveOption);
 
-	if (!parserParams.exactMatch(params[1]))
+    match = parserPoint.match(params[1]);
+    if (!match.hasMatch())
 		return false;
 
-	params = parserParams.capturedTexts();
+    params = match.capturedTexts();
 
 	if (params.size() != 5)
 		return false;

QtnProperty/Core/PropertyQRect.cpp

@@ -16,8 +16,8 @@ limitations under the License.
 *******************************************************************************/
 
 #include "PropertyQRect.h"
-
 #include "PropertyQSize.h"
+#include <QRegularExpression>
 
 QtnProperty *QtnPropertyQRectBase::createLeftProperty(bool move)
 {
@@ -82,23 +82,26 @@ QtnPropertyQRectBase::QtnPropertyQRectBase(QObject *parent)
 bool QtnPropertyQRectBase::fromStrImpl(
 	const QString &str, QtnPropertyChangeReason reason)
 {
-	static QRegExp parserRect(
-		"^\\s*QRect\\s*\\(([^\\)]+)\\)\\s*$", Qt::CaseInsensitive);
-	static QRegExp parserParams(
-		"^\\s*(-?\\d+)\\s*,\\s*(-?\\d+)\\s*,\\s*(\\d+)\\s*,\\s*(\\d+)\\s*$",
-		Qt::CaseInsensitive);
+    static QRegularExpression parserRect(
+        "^\\s*QRect\\s*\\(([^\\)]+)\\)\\s*$", QRegularExpression::CaseInsensitiveOption);
 
-	if (!parserRect.exactMatch(str))
+    QRegularExpressionMatch match = parserRect.match(str);
+    if (!match.hasMatch())
 		return false;
 
-	QStringList params = parserRect.capturedTexts();
+    QStringList params = match.capturedTexts();
 	if (params.size() != 2)
 		return false;
 
-	if (!parserParams.exactMatch(params[1]))
+    static QRegularExpression parserParams(
+        "^\\s*(-?\\d+)\\s*,\\s*(-?\\d+)\\s*,\\s*(\\d+)\\s*,\\s*(\\d+)\\s*$",
+        QRegularExpression::CaseInsensitiveOption);
+
+    match = parserParams.match(params[1]);
+    if (!match.hasMatch())
 		return false;
 
-	params = parserParams.capturedTexts();
+    params = match.capturedTexts();
 	if (params.size() != 5)
 		return false;
 

QtnProperty/Core/PropertyQRectF.cpp

@@ -16,9 +16,9 @@ limitations under the License.
 *******************************************************************************/
 
 #include "PropertyQRectF.h"
-
 #include "PropertyQRect.h"
 #include "PropertyQSize.h"
+#include <QRegularExpression>
 
 QtnProperty *QtnPropertyQRectFBase::createLeftProperty(bool move)
 {
@@ -73,24 +73,27 @@ QtnPropertyQRectFBase::QtnPropertyQRectFBase(QObject *parent)
 bool QtnPropertyQRectFBase::fromStrImpl(
 	const QString &str, QtnPropertyChangeReason reason)
 {
-	static QRegExp parserRect(
-		"^\\s*QRectF\\s*\\(([^\\)]+)\\)\\s*$", Qt::CaseInsensitive);
-	static QRegExp parserParams("^\\s*(\\-?\\d+(\\.\\d{0,})?)\\s*,\\s*(\\-?\\d+"
-								"(\\.\\d{0,})?)\\s*,\\s*(\\d+(\\.\\d{0,})?)\\s*"
-								",\\s*(\\d+(\\.\\d{0,})?)\\s*$",
-		Qt::CaseInsensitive);
-
-	if (!parserRect.exactMatch(str))
+    static QRegularExpression parserRect(
+        "^\\s*QRectF\\s*\\(([^\\)]+)\\)\\s*$", QRegularExpression::CaseInsensitiveOption);
+
+    QRegularExpressionMatch match = parserRect.match(str);
+    if (!match.hasMatch())
 		return false;
 
-	QStringList params = parserRect.capturedTexts();
+    QStringList params = match.capturedTexts();
 	if (params.size() != 2)
 		return false;
 
-	if (!parserParams.exactMatch(params[1]))
+    static QRegularExpression parserParams("^\\s*(\\-?\\d+(\\.\\d{0,})?)\\s*,\\s*(\\-?\\d+"
+                                "(\\.\\d{0,})?)\\s*,\\s*(\\d+(\\.\\d{0,})?)\\s*"
+                                ",\\s*(\\d+(\\.\\d{0,})?)\\s*$",
+        QRegularExpression::CaseInsensitiveOption);
+
+    match = parserParams.match(params[1]);
+    if (!match.hasMatch())
 		return false;
 
-	params = parserParams.capturedTexts();
+    params = match.capturedTexts();
 	if (params.size() != 9)
 		return false;
 

QtnProperty/Core/PropertyQSize.cpp

@@ -17,6 +17,7 @@ limitations under the License.
 
 #include "PropertyQSize.h"
 #include "PropertyInt.h"
+#include <QRegularExpression>
 
 QtnPropertyQSizeBase::QtnPropertyQSizeBase(QObject *parent)
 	: ParentClass(parent)
@@ -40,24 +41,26 @@ QtnProperty *QtnPropertyQSizeBase::createHeightProperty()
 bool QtnPropertyQSizeBase::fromStrImpl(
 	const QString &str, QtnPropertyChangeReason reason)
 {
-	static QRegExp parserSize(
-		"^\\s*QSize\\s*\\(([^\\)]+)\\)\\s*$", Qt::CaseInsensitive);
+    static QRegularExpression parserSize(
+        "^\\s*QSize\\s*\\(([^\\)]+)\\)\\s*$", QRegularExpression::CaseInsensitiveOption);
 
-	if (!parserSize.exactMatch(str))
+    QRegularExpressionMatch match = parserSize.match(str);
+    if (!match.hasMatch())
 		return false;
 
-	QStringList params = parserSize.capturedTexts();
+    QStringList params = match.capturedTexts();
 
 	if (params.size() != 2)
 		return false;
 
-	static QRegExp parserParams(
-		"^\\s*(-?\\d+)\\s*,\\s*(-?\\d+)\\s*$", Qt::CaseInsensitive);
+    static QRegularExpression parserParams(
+        "^\\s*(-?\\d+)\\s*,\\s*(-?\\d+)\\s*$", QRegularExpression::CaseInsensitiveOption);
 
-	if (!parserParams.exactMatch(params[1]))
+    match = parserParams.match(params[1]);
+    if (!match.hasMatch())
 		return false;
 
-	params = parserParams.capturedTexts();
+    params = match.capturedTexts();
 
 	if (params.size() != 3)
 		return false;

QtnProperty/Core/PropertyQSizeF.cpp

@@ -16,8 +16,8 @@ limitations under the License.
 *******************************************************************************/
 
 #include "PropertyQSizeF.h"
-
 #include "PropertyQSize.h"
+#include <QRegularExpression>
 
 QtnPropertyQSizeFBase::QtnPropertyQSizeFBase(QObject *parent)
 	: ParentClass(parent)
@@ -41,25 +41,27 @@ QtnProperty *QtnPropertyQSizeFBase::createHeightProperty()
 bool QtnPropertyQSizeFBase::fromStrImpl(
 	const QString &str, QtnPropertyChangeReason reason)
 {
-	static QRegExp parserSize(
-		"^\\s*QSizeF\\s*\\(([^\\)]+)\\)\\s*$", Qt::CaseInsensitive);
+    static QRegularExpression parserSize(
+        "^\\s*QSizeF\\s*\\(([^\\)]+)\\)\\s*$", QRegularExpression::CaseInsensitiveOption);
 
-	if (!parserSize.exactMatch(str))
+    QRegularExpressionMatch match = parserSize.match(str);
+    if (!match.hasMatch())
 		return false;
 
-	QStringList params = parserSize.capturedTexts();
+    QStringList params = match.capturedTexts();
 
 	if (params.size() != 2)
 		return false;
 
-	static QRegExp parserParams(
+    static QRegularExpression parserParams(
 		"^\\s*(\\-?\\d+(\\.\\d{0,})?)\\s*,\\s*(\\-?\\d+(\\.\\d{0,})?)\\s*$",
-		Qt::CaseInsensitive);
+        QRegularExpression::CaseInsensitiveOption);
 
-	if (!parserParams.exactMatch(params[1]))
+    match = parserParams.match(params[1]);
+    if (!match.hasMatch())
 		return false;
 
-	params = parserParams.capturedTexts();
+    params = match.capturedTexts();
 
 	if (params.size() != 5)
 		return false;

QtnProperty/CustomPropertyWidget.cpp

@@ -449,7 +449,7 @@ QMimeData *QtnCustomPropertyWidget::getPropertyDataForAction(
 					QString::fromUtf8(&json.constData()[start], end - start)
 						.trimmed());
 
-				mime->setData(kCustomPropertyData, doc.toBinaryData());
+                mime->setData(kCustomPropertyData, doc.toJson());
 
 				return mime;
 			}
@@ -566,7 +566,7 @@ bool QtnCustomPropertyWidget::applyPropertyData(const QMimeData *data,
 		if (data->hasFormat(kCustomPropertyData))
 		{
 			auto doc =
-				QJsonDocument::fromBinaryData(data->data(kCustomPropertyData));
+                QJsonDocument::fromJson(data->data(kCustomPropertyData));
 
 			if (doc.isObject())
 			{

QtnProperty/Delegates/Core/PropertyDelegateQString.cpp

@@ -411,7 +411,6 @@ bool QtnPropertyDelegateQStringFile::isPropertyValid() const
 			return QFileInfo(filePath).isFile();
 
 		case QFileDialog::Directory:
-		case QFileDialog::DirectoryOnly:
 			return QFileInfo(filePath).isDir();
 	}
 
@@ -524,7 +523,7 @@ QtnPropertyQStringListComboBoxHandler::QtnPropertyQStringListComboBoxHandler(
 	editor.clear();
 	editor.addItems(items);
 	editor.setEditable(editable);
-	editor.setAutoCompletion(false);
+    editor.setCompleter(nullptr);
 
 	if (editable)
 		editor.installEventFilter(this);

QtnProperty/Delegates/GUI/PropertyDelegateButton.cpp

@@ -139,7 +139,7 @@ void QtnPropertyDelegateButtonLink::createSubItemsImpl(
 	QtnDrawContext &context, QList<QtnSubItem> &subItems)
 {
 	QtnSubItem linkItem(context.rect.marginsRemoved(context.margins));
-	linkItem.rect.setWidth(context.painter->fontMetrics().width(m_title));
+    linkItem.rect.setWidth(context.painter->fontMetrics().boundingRect(m_title).width());
 	linkItem.setPropertyDescriptionAsTooltip(owner());
 	linkItem.trackState();