diff options
Diffstat (limited to 'src/plugins/qmldesigner')
5 files changed, 55 insertions, 26 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp index 92ac7fdf8f..7032a26ef7 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp @@ -25,23 +25,22 @@ #include "quick2propertyeditorview.h" -#include "aligndistribute.h" -#include "annotationeditor/annotationeditor.h" -#include "bindingeditor/actioneditor.h" -#include "bindingeditor/bindingeditor.h" +#include "propertyeditorvalue.h" #include "fileresourcesmodel.h" #include "gradientmodel.h" -#include "gradientpresetcustomlistmodel.h" #include "gradientpresetdefaultlistmodel.h" +#include "gradientpresetcustomlistmodel.h" #include "itemfiltermodel.h" -#include "propertyeditorcontextobject.h" -#include "propertyeditorqmlbackend.h" -#include "propertyeditorvalue.h" -#include "qmlanchorbindingproxy.h" -#include "richtexteditor/richtexteditorproxy.h" #include "simplecolorpalettemodel.h" +#include "bindingeditor/bindingeditor.h" +#include "bindingeditor/actioneditor.h" +#include "annotationeditor/annotationeditor.h" +#include "qmlanchorbindingproxy.h" #include "theme.h" +#include "aligndistribute.h" +#include "propertyeditorcontextobject.h" #include "tooltip.h" +#include "richtexteditor/richtexteditorproxy.h" namespace QmlDesigner { @@ -72,11 +71,6 @@ void Quick2PropertyEditorView::registerQmlTypes() Tooltip::registerDeclarativeType(); EasingCurveEditor::registerDeclarativeType(); RichTextEditorProxy::registerDeclarativeType(); - QUrl regExpUrl = QUrl::fromLocalFile(PropertyEditorQmlBackend::propertyEditorResourcesPath() - + "/RegExpValidator.qml"); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - qmlRegisterType(regExpUrl, "HelperWidgets", 2, 0, "RegExpValidator"); -#endif } } diff --git a/src/plugins/qmldesigner/designercore/include/propertycontainer.h b/src/plugins/qmldesigner/designercore/include/propertycontainer.h index ae38f9aafc..5eebf01fbd 100644 --- a/src/plugins/qmldesigner/designercore/include/propertycontainer.h +++ b/src/plugins/qmldesigner/designercore/include/propertycontainer.h @@ -66,4 +66,8 @@ private: mutable QVariant m_value; }; +QMLDESIGNERCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const QList<PropertyContainer> &propertyContainerList); +QMLDESIGNERCORE_EXPORT QDataStream &operator>>(QDataStream &stream, QList<PropertyContainer> &propertyContainerList); +QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, QList<PropertyContainer> &propertyContainerList); + } //namespace QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 0e40c8edab..f196f5ca40 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -203,7 +203,7 @@ static bool isIdToAvoid(const QString& id) static bool idContainsWrongLetter(const QString& id) { - static QRegularExpression idExpr(QStringLiteral("^[a-z_][a-zA-Z0-9_]*$")); + static QRegularExpression idExpr(QStringLiteral("^[a-z_][a-zA-Z0-9_]+$")); return !id.contains(idExpr); } diff --git a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp index 440b91ffa0..ae62b4d0e6 100644 --- a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp @@ -113,5 +113,37 @@ QDebug operator<<(QDebug debug, const PropertyContainer &propertyContainer) return debug.space(); } +QDataStream &operator<<(QDataStream &stream, const QList<PropertyContainer> &propertyContainerList) +{ + stream << propertyContainerList.count(); + foreach (const PropertyContainer &propertyContainer, propertyContainerList) + stream << propertyContainer; + + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QList<PropertyContainer> &propertyContainerList) +{ + int count; + stream >> count; + Q_ASSERT(count >= 0); + for ( int i = 0; i < count; i++) { + PropertyContainer propertyContainer; + stream >> propertyContainer; + propertyContainerList.append(propertyContainer); + } + + return stream; +} + +QDebug operator<<(QDebug debug, QList<PropertyContainer> &propertyContainerList) +{ + foreach (const PropertyContainer &propertyContainer, propertyContainerList) + debug << propertyContainer; + + return debug.space(); +} + + } //namespace QmlDesigner diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 489d7951c1..91d760339b 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -55,19 +55,18 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/coreconstants.h> #include <coreplugin/designmode.h> -#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/icore.h> #include <coreplugin/idocument.h> #include <coreplugin/messagebox.h> #include <coreplugin/modemanager.h> +#include <coreplugin/editormanager/editormanager.h> #include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginspec.h> -#include <projectexplorer/project.h> +#include <qmljs/qmljsmodelmanagerinterface.h> #include <projectexplorer/projectexplorerconstants.h> -#include <projectexplorer/session.h> +#include <projectexplorer/project.h> #include <projectexplorer/target.h> -#include <sqlitelibraryinitializer.h> -#include <qmljs/qmljsmodelmanagerinterface.h> +#include <projectexplorer/session.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> @@ -212,9 +211,7 @@ QmlDesignerPlugin::~QmlDesignerPlugin() //////////////////////////////////////////////////// bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage/* = 0*/) { - Sqlite::LibraryInitializer::initialize(); - - QDir{}.mkpath(Core::ICore::cacheResourcePath()); + QDir{}.mkpath(Core::ICore::cacheResourcePath().toString()); if (!Utils::HostOsInfo::canCreateOpenGLContext(errorMessage)) return false; @@ -222,8 +219,10 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e if (DesignerSettings::getValue(DesignerSettingsKey::STANDALONE_MODE).toBool()) GenerateResource::generateMenuEntry(); - QString fontPath = Core::ICore::resourcePath() + - QStringLiteral("/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf"); + const QString fontPath + = Core::ICore::resourcePath( + "qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf") + .toString(); if (QFontDatabase::addApplicationFont(fontPath) < 0) qCWarning(qmldesignerLog) << "Could not add font " << fontPath << "to font database"; |