diff options
Diffstat (limited to 'src/designer/src')
158 files changed, 1030 insertions, 1097 deletions
diff --git a/src/designer/src/components/formeditor/dpi_chooser.cpp b/src/designer/src/components/formeditor/dpi_chooser.cpp index 5e2f9f605..a254bf12a 100644 --- a/src/designer/src/components/formeditor/dpi_chooser.cpp +++ b/src/designer/src/components/formeditor/dpi_chooser.cpp @@ -94,7 +94,7 @@ DPI_Chooser::DPI_Chooser(QWidget *parent) : setFocusProxy(m_predefinedCombo); m_predefinedCombo->setEditable(false); m_predefinedCombo->setCurrentIndex(0); - connect(m_predefinedCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), + connect(m_predefinedCombo, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &DPI_Chooser::syncSpinBoxes); // top row with predefined settings QVBoxLayout *vBoxLayout = new QVBoxLayout; diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp index 85cc1f930..062fc6e4f 100644 --- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp +++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp @@ -145,7 +145,7 @@ void EmbeddedOptionsControlPrivate::init(EmbeddedOptionsControl *q) m_profileCombo->setEditable(false); hLayout->addWidget(m_profileCombo); m_profileCombo->addItem(EmbeddedOptionsControl::tr("None")); - EmbeddedOptionsControl::connect(m_profileCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), + EmbeddedOptionsControl::connect(m_profileCombo, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), m_q, &EmbeddedOptionsControl::slotProfileIndexChanged); m_addButton->setIcon(createIconSet(QString::fromUtf8("plus.png"))); diff --git a/src/designer/src/components/formeditor/formeditor.cpp b/src/designer/src/components/formeditor/formeditor.cpp index 05e7fc4ee..0e1db2501 100644 --- a/src/designer/src/components/formeditor/formeditor.cpp +++ b/src/designer/src/components/formeditor/formeditor.cpp @@ -142,7 +142,7 @@ FormEditor::FormEditor(QObject *parent) connect(resourceModel, &QtResourceModel::qrcFileModifiedExternally, this, &FormEditor::slotQrcFileChangedExternally); - QList<QDesignerOptionsPageInterface*> optionsPages; + QVector<QDesignerOptionsPageInterface*> optionsPages; optionsPages << new TemplateOptionsPage(this) << new FormEditorOptionsPage(this) << new EmbeddedOptionsPage(this); setOptionsPages(optionsPages); diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 84e065bcb..8285d84c5 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -723,7 +723,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e) sel.prepend(current); } - QList<QDesignerDnDItemInterface*> item_list; + QVector<QDesignerDnDItemInterface*> item_list; const QPoint globalPos = mapToGlobal(m_startPos); const QDesignerDnDItemInterface::DropType dropType = (mouseFlags(e->modifiers()) & CopyDragModifier) ? QDesignerDnDItemInterface::CopyDrop : QDesignerDnDItemInterface::MoveDrop; @@ -2827,7 +2827,7 @@ bool FormWindow::dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &g return true; } -bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, +bool FormWindow::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target, const QPoint &global_mouse_pos) { diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h index abecc8252..cb5019d35 100644 --- a/src/designer/src/components/formeditor/formwindow.h +++ b/src/designer/src/components/formeditor/formwindow.h @@ -189,7 +189,7 @@ public: void resizeWidget(QWidget *widget, const QRect &geometry); bool dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &global_mouse_pos); - bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, + bool dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target, const QPoint &global_mouse_pos) override; QWidget *findContainer(QWidget *w, bool excludeLayout) const override; diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.h b/src/designer/src/components/formeditor/formwindow_widgetstack.h index 01ee921fd..e1a5dd161 100644 --- a/src/designer/src/components/formeditor/formwindow_widgetstack.h +++ b/src/designer/src/components/formeditor/formwindow_widgetstack.h @@ -76,7 +76,7 @@ protected: QWidget *defaultEditor() const; private: - QList<QDesignerFormWindowToolInterface*> m_tools; + QVector<QDesignerFormWindowToolInterface*> m_tools; QWidget *m_formContainer; QStackedLayout *m_formContainerLayout; QStackedLayout *m_layout; diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp index 692b20c54..ce3db6583 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.cpp +++ b/src/designer/src/components/formeditor/formwindowmanager.cpp @@ -955,7 +955,7 @@ void FormWindowManager::deviceProfilesChanged() // DnD stuff -void FormWindowManager::dragItems(const QList<QDesignerDnDItemInterface*> &item_list) +void FormWindowManager::dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) { QDesignerMimeData::execDrag(item_list, m_core->topLevel()); } diff --git a/src/designer/src/components/formeditor/formwindowmanager.h b/src/designer/src/components/formeditor/formwindowmanager.h index d9723cea6..cae24e407 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.h +++ b/src/designer/src/components/formeditor/formwindowmanager.h @@ -77,7 +77,7 @@ public: bool eventFilter(QObject *o, QEvent *e) override; - void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) override; + void dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) override; QUndoGroup *undoGroup() const; @@ -122,7 +122,7 @@ private: QDesignerFormEditorInterface *m_core; FormWindow *m_activeFormWindow; - QList<FormWindow*> m_formWindows; + QVector<FormWindow*> m_formWindows; PreviewManager *m_previewManager; diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp index de03c6792..3e24b7623 100644 --- a/src/designer/src/components/formeditor/formwindowsettings.cpp +++ b/src/designer/src/components/formeditor/formwindowsettings.cpp @@ -108,12 +108,13 @@ void FormWindowData::fromFormWindow(FormWindowBase* fw) defaultMargin = defaultSpacing = INT_MIN; fw->layoutDefault(&defaultMargin, &defaultSpacing); - QStyle *style = fw->formContainer()->style(); + auto container = fw->formContainer(); + QStyle *style = container->style(); layoutDefaultEnabled = defaultMargin != INT_MIN || defaultSpacing != INT_MIN; if (defaultMargin == INT_MIN) - defaultMargin = style->pixelMetric(QStyle::PM_DefaultChildMargin, nullptr); + defaultMargin = style->pixelMetric(QStyle::PM_LayoutLeftMargin, nullptr, container); if (defaultSpacing == INT_MIN) - defaultSpacing = style->pixelMetric(QStyle::PM_DefaultLayoutSpacing, nullptr); + defaultSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, nullptr); marginFunction.clear(); diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index ff4a42744..2a1cdce3f 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -108,7 +108,7 @@ Q_DECLARE_METATYPE(QWidgetList) QT_BEGIN_NAMESPACE namespace { - using DomPropertyList = QList<DomProperty *>; + using DomPropertyList = QVector<DomProperty *>; } static const char *currentUiVersion = "4.0"; @@ -939,7 +939,7 @@ static bool readDomEnumerationValue(const DomProperty *p, return false; } -void QDesignerResource::applyProperties(QObject *o, const QList<DomProperty*> &properties) +void QDesignerResource::applyProperties(QObject *o, const QVector<DomProperty*> &properties) { if (properties.isEmpty()) return; @@ -1387,7 +1387,7 @@ DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_paren designerWarning(msgUnmanagedPage(core(), widget, i, page)); continue; } - QList<DomProperty*> ui_attribute_list; + QVector<DomProperty*> ui_attribute_list; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); // attribute `icon' @@ -1456,7 +1456,7 @@ DomWidget *QDesignerResource::saveWidget(QToolBox *widget, DomWidget *ui_parentW } // attribute `label' - QList<DomProperty*> ui_attribute_list; + QVector<DomProperty*> ui_attribute_list; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); @@ -1534,7 +1534,7 @@ bool QDesignerResource::checkProperty(QObject *obj, const QString &prop) const const QDesignerMetaObjectInterface *meta = core()->introspection()->metaObject(obj); const int pindex = meta->indexOfProperty(prop); - if (pindex != -1 && !(meta->property(pindex)->attributes(obj) & QDesignerMetaPropertyInterface::StoredAttribute)) + if (pindex != -1 && !meta->property(pindex)->attributes().testFlag(QDesignerMetaPropertyInterface::StoredAttribute)) return false; if (prop == QStringLiteral("objectName") || prop == QStringLiteral("spacerName")) // ### don't store the property objectName @@ -1889,13 +1889,13 @@ bool QDesignerResource::canCompressSpacings(QObject *object) const return false; } -QList<DomProperty*> QDesignerResource::computeProperties(QObject *object) +QVector<DomProperty*> QDesignerResource::computeProperties(QObject *object) { - QList<DomProperty*> properties; + QVector<DomProperty*> properties; if (QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), object)) { QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core()->extensionManager(), object); const int count = sheet->count(); - QList<DomProperty *> spacingProperties; + QVector<DomProperty *> spacingProperties; const bool compressSpacings = canCompressSpacings(object); for (int index = 0; index < count; ++index) { if (!sheet->isChanged(index) && (!dynamicSheet || !dynamicSheet->isDynamicProperty(index))) diff --git a/src/designer/src/components/formeditor/qdesigner_resource.h b/src/designer/src/components/formeditor/qdesigner_resource.h index d667f1372..78e4bacb6 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.h +++ b/src/designer/src/components/formeditor/qdesigner_resource.h @@ -90,8 +90,8 @@ protected: QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override; QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) override; QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget) override; - void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; - QList<DomProperty*> computeProperties(QObject *obj) override; + void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; + QVector<DomProperty*> computeProperties(QObject *obj) override; DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value) override; QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) override; @@ -145,7 +145,7 @@ private: QStringList mergeWithLoadedPaths(const QStringList &paths) const; void applyAttributesToPropertySheet(const DomWidget *ui_widget, QWidget *widget); - using DomCustomWidgetList = QList<DomCustomWidget *>; + using DomCustomWidgetList = QVector<DomCustomWidget *>; void addCustomWidgetsToWidgetDatabase(DomCustomWidgetList& list); FormWindow *m_formWindow; bool m_isMainWidget; diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp index 180c38e79..37b376115 100644 --- a/src/designer/src/components/formeditor/qmainwindow_container.cpp +++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp @@ -92,7 +92,7 @@ Qt::DockWidgetArea dockWidgetArea(QDockWidget *me) if (const QMainWindow *mw = qobject_cast<const QMainWindow*>(me->parentWidget())) { // Make sure that me is actually managed by mw, otherwise // QMainWindow::dockWidgetArea() will be VERY upset - QList<QLayout*> candidates; + QVector<QLayout*> candidates; if (mw->layout()) { candidates.append(mw->layout()); candidates += mw->layout()->findChildren<QLayout*>(); diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h index 14bcf78cb..35446cc49 100644 --- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h +++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h @@ -76,7 +76,7 @@ namespace qdesigner_internal { ExtensionContainer // QTabWidget and the like, container extension }; - using StandardItemList = QList<QStandardItem *>; + using StandardItemList = QVector<QStandardItem *>; explicit ObjectData(QObject *parent, QObject *object, const ModelRecursionContext &ctx); ObjectData(); @@ -121,7 +121,7 @@ namespace qdesigner_internal { // internally for its updates. class ObjectInspectorModel : public QStandardItemModel { public: - using StandardItemList = QList<QStandardItem *>; + using StandardItemList = QVector<QStandardItem *>; enum { ObjectNameColumn, ClassNameColumn, NumColumns }; explicit ObjectInspectorModel(QObject *parent); diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp index 27d265696..94853da86 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp @@ -1291,7 +1291,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property, } pfit.value().clear(); - QList<uint> values; + QVector<uint> values; for (const QPair<QString, uint> &pair : flags) { const QString flagName = pair.first; @@ -2040,7 +2040,7 @@ void DesignerPropertyManager::initializeProperty(QtProperty *property) default: if (type == designerFlagTypeId()) { m_flagValues[property] = FlagData(); - m_propertyToFlags[property] = QList<QtProperty *>(); + m_propertyToFlags[property] = QVector<QtProperty *>(); } else if (type == designerAlignmentTypeId()) { const uint align = Qt::AlignLeft | Qt::AlignVCenter; m_alignValues[property] = align; @@ -2266,7 +2266,7 @@ void DesignerEditorFactory::disconnectPropertyManager(QtVariantPropertyManager * } // A helper that calls a setter with a value on a pointer list of editor objects. -// Could use QList<Editor*> instead of EditorContainer/Editor, but that crashes VS 6. +// Could use QVector<Editor*> instead of EditorContainer/Editor, but that crashes VS 6. template <class EditorContainer, class Editor, class SetterParameter, class Value> static inline void applyToEditors(const EditorContainer &list, void (Editor::*setter)(SetterParameter), const Value &value) { @@ -2544,7 +2544,7 @@ QWidget *DesignerEditorFactory::createEditor(QtVariantPropertyManager *manager, template <class Editor> bool removeEditor(QObject *object, - QMap<QtProperty *, QList<Editor> > *propertyToEditors, + QMap<QtProperty *, QVector<Editor> > *propertyToEditors, QMap<Editor, QtProperty *> *editorToProperty) { if (!propertyToEditors) diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.h b/src/designer/src/components/propertyeditor/designerpropertymanager.h index abc6e385c..85c183a31 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.h +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE typedef QPair<QString, uint> DesignerIntPair; -using DesignerFlagList = QList<DesignerIntPair>; +using DesignerFlagList = QVector<DesignerIntPair>; class QDesignerFormEditorInterface; class QLineEdit; @@ -80,7 +80,7 @@ private slots: void slotPropertyChanged(QtProperty *property); void slotEditorDestroyed(QObject *object); private: - QMap<QtProperty *, QList<ResetWidget *> > m_createdResetWidgets; + QMap<QtProperty *, QVector<ResetWidget *> > m_createdResetWidgets; QMap<ResetWidget *, QtProperty *> m_resetWidgetToProperty; int m_spacing; const QDesignerFormEditorInterface *m_core; @@ -180,11 +180,11 @@ private: { uint val{0}; DesignerFlagList flags; - QList<uint> values; + QVector<uint> values; }; typedef QMap<QtProperty *, FlagData> PropertyFlagDataMap; PropertyFlagDataMap m_flagValues; - typedef QMap<QtProperty *, QList<QtProperty *> > PropertyToPropertyListMap; + typedef QMap<QtProperty *, QVector<QtProperty *> > PropertyToPropertyListMap; PropertyToPropertyListMap m_propertyToFlags; QMap<QtProperty *, QtProperty *> m_flagToProperty; @@ -290,28 +290,28 @@ private: int m_spacing; - QMap<QtProperty *, QList<TextEditor *> > m_stringPropertyToEditors; - QMap<TextEditor *, QtProperty *> m_editorToStringProperty; - QMap<QtProperty *, QList<QKeySequenceEdit *> > m_keySequencePropertyToEditors; + QMap<QtProperty *, QVector<TextEditor *> > m_stringPropertyToEditors; + QMap<TextEditor *, QtProperty *> m_editorToStringProperty; + QMap<QtProperty *, QVector<QKeySequenceEdit *> > m_keySequencePropertyToEditors; QMap<QKeySequenceEdit *, QtProperty *> m_editorToKeySequenceProperty; - QMap<QtProperty *, QList<PaletteEditorButton *> > m_palettePropertyToEditors; - QMap<PaletteEditorButton *, QtProperty *> m_editorToPaletteProperty; - QMap<QtProperty *, QList<PixmapEditor *> > m_pixmapPropertyToEditors; - QMap<PixmapEditor *, QtProperty *> m_editorToPixmapProperty; - QMap<QtProperty *, QList<PixmapEditor *> > m_iconPropertyToEditors; - QMap<PixmapEditor *, QtProperty *> m_editorToIconProperty; - QMap<QtProperty *, QList<QLineEdit *> > m_uintPropertyToEditors; - QMap<QLineEdit *, QtProperty *> m_editorToUintProperty; - QMap<QtProperty *, QList<QLineEdit *> > m_longLongPropertyToEditors; - QMap<QLineEdit *, QtProperty *> m_editorToLongLongProperty; - QMap<QtProperty *, QList<QLineEdit *> > m_uLongLongPropertyToEditors; - QMap<QLineEdit *, QtProperty *> m_editorToULongLongProperty; - QMap<QtProperty *, QList<TextEditor *> > m_urlPropertyToEditors; - QMap<TextEditor *, QtProperty *> m_editorToUrlProperty; - QMap<QtProperty *, QList<TextEditor *> > m_byteArrayPropertyToEditors; - QMap<TextEditor *, QtProperty *> m_editorToByteArrayProperty; - QMap<QtProperty *, QList<StringListEditorButton *> > m_stringListPropertyToEditors; - QMap<StringListEditorButton *, QtProperty *> m_editorToStringListProperty; + QMap<QtProperty *, QVector<PaletteEditorButton *> > m_palettePropertyToEditors; + QMap<PaletteEditorButton *, QtProperty *> m_editorToPaletteProperty; + QMap<QtProperty *, QVector<PixmapEditor *> > m_pixmapPropertyToEditors; + QMap<PixmapEditor *, QtProperty *> m_editorToPixmapProperty; + QMap<QtProperty *, QVector<PixmapEditor *> > m_iconPropertyToEditors; + QMap<PixmapEditor *, QtProperty *> m_editorToIconProperty; + QMap<QtProperty *, QVector<QLineEdit *> > m_uintPropertyToEditors; + QMap<QLineEdit *, QtProperty *> m_editorToUintProperty; + QMap<QtProperty *, QVector<QLineEdit *> > m_longLongPropertyToEditors; + QMap<QLineEdit *, QtProperty *> m_editorToLongLongProperty; + QMap<QtProperty *, QVector<QLineEdit *> > m_uLongLongPropertyToEditors; + QMap<QLineEdit *, QtProperty *> m_editorToULongLongProperty; + QMap<QtProperty *, QVector<TextEditor *> > m_urlPropertyToEditors; + QMap<TextEditor *, QtProperty *> m_editorToUrlProperty; + QMap<QtProperty *, QVector<TextEditor *> > m_byteArrayPropertyToEditors; + QMap<TextEditor *, QtProperty *> m_editorToByteArrayProperty; + QMap<QtProperty *, QVector<StringListEditorButton *> > m_stringListPropertyToEditors; + QMap<StringListEditorButton *, QtProperty *> m_editorToStringListProperty; }; } // namespace qdesigner_internal diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.h b/src/designer/src/components/propertyeditor/fontpropertymanager.h index 1041cd357..fd6c5186f 100644 --- a/src/designer/src/components/propertyeditor/fontpropertymanager.h +++ b/src/designer/src/components/propertyeditor/fontpropertymanager.h @@ -81,7 +81,7 @@ public: private: using PropertyToPropertyMap = QMap<QtProperty *, QtProperty *>; - using PropertyList = QList<QtProperty *>; + using PropertyList = QVector<QtProperty *>; using PropertyToSubPropertiesMap = QMap<QtProperty *, PropertyList>; void removeAntialiasingProperty(QtProperty *); diff --git a/src/designer/src/components/propertyeditor/previewframe.cpp b/src/designer/src/components/propertyeditor/previewframe.cpp index a97e46877..c093663e2 100644 --- a/src/designer/src/components/propertyeditor/previewframe.cpp +++ b/src/designer/src/components/propertyeditor/previewframe.cpp @@ -78,7 +78,7 @@ PreviewFrame::PreviewFrame(QWidget *parent) : void PreviewFrame::setPreviewPalette(const QPalette &pal) { - ensureMdiSubWindow()->widget()->setPalette(pal); + ensureMdiSubWindow()->setPalette(pal); } void PreviewFrame::setSubWindowActive(bool active) diff --git a/src/designer/src/components/propertyeditor/previewwidget.cpp b/src/designer/src/components/propertyeditor/previewwidget.cpp index cc5a3af31..d041ec9be 100644 --- a/src/designer/src/components/propertyeditor/previewwidget.cpp +++ b/src/designer/src/components/propertyeditor/previewwidget.cpp @@ -28,6 +28,11 @@ #include "previewwidget.h" +#include <QtWidgets/qaction.h> +#include <QtWidgets/qmenu.h> + +#include <QtCore/qabstractitemmodel.h> + QT_BEGIN_NAMESPACE using namespace qdesigner_internal; @@ -36,6 +41,16 @@ PreviewWidget::PreviewWidget(QWidget *parent) : QWidget(parent) { ui.setupUi(this); + ui.treeWidget->expandAll(); + auto model = ui.treeWidget->model(); + ui.treeWidget->setCurrentIndex(model->index(0, 0, model->index(0, 0))); + auto toolButtonMenu = new QMenu(ui.menuToolButton); + toolButtonMenu->addAction(tr("Option 1")); + toolButtonMenu->addSeparator(); + auto checkable = toolButtonMenu->addAction(tr("Checkable")); + checkable->setCheckable(true); + ui.menuToolButton->setMenu(toolButtonMenu); + ui.menuToolButton->setPopupMode(QToolButton::InstantPopup); } PreviewWidget::~PreviewWidget() = default; diff --git a/src/designer/src/components/propertyeditor/previewwidget.ui b/src/designer/src/components/propertyeditor/previewwidget.ui index fc81c8b85..077ff24b4 100644 --- a/src/designer/src/components/propertyeditor/previewwidget.ui +++ b/src/designer/src/components/propertyeditor/previewwidget.ui @@ -1,4 +1,5 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <comment>********************************************************************* ** ** Copyright (C) 2016 The Qt Company Ltd. @@ -27,191 +28,296 @@ ** *********************************************************************</comment> <class>qdesigner_internal::PreviewWidget</class> - <widget class="QWidget" name="qdesigner_internal::PreviewWidget" > - <property name="geometry" > + <widget class="QWidget" name="qdesigner_internal::PreviewWidget"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>471</width> - <height>251</height> + <width>608</width> + <height>367</height> </rect> </property> - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string extracomment="Palette Editor Preview Widget">Preview Window</string> </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item rowspan="3" row="0" column="1" > - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QGroupBox" name="buttonGroup"> + <property name="title"> + <string extracomment="Palette Editor Preview Widget">Buttons</string> </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QLineEdit" name="LineEdit1" > - <property name="text" > - <string extracomment="Palette Editor Preview Widget">LineEdit</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="ComboBox1" > - <item> - <property name="text" > - <string extracomment="Palette Editor Preview Widget">ComboBox</string> - </property> - </item> - </widget> - </item> - <item> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QSpinBox" name="SpinBox1" /> - </item> - <item> - <widget class="QPushButton" name="PushButton1" > - <property name="text" > - <string extracomment="Palette Editor Preview Widget">PushButton</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QScrollBar" name="ScrollBar1" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item> - <widget class="QSlider" name="Slider1" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item> - <widget class="QListWidget" name="listWidget" > - <property name="maximumSize" > - <size> - <width>32767</width> - <height>50</height> - </size> - </property> - </widget> - </item> - </layout> - </item> - <item row="3" column="0" colspan="2" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="0" > - <widget class="QProgressBar" name="ProgressBar1" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> + <property name="checkable"> + <bool>true</bool> </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QRadioButton" name="RadioButton1"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">RadioButton1</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="RadioButton2"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">RadioButton2</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="RadioButton3"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">RadioButton3</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="CheckBox1"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">CheckBox1</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="CheckBox2"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">Tristate CheckBox</string> + </property> + <property name="tristate"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QPushButton" name="PushButton1"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">PushButton</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="toggleButton"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">ToggleButton</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="flat"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QToolButton" name="toolButton"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">ToolButton</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="menuToolButton"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">Menu</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> </widget> </item> - <item row="1" column="0" > - <widget class="QGroupBox" name="ButtonGroup2" > - <property name="title" > - <string extracomment="Palette Editor Preview Widget">ButtonGroup2</string> + <item row="0" column="1"> + <widget class="QGroupBox" name="itemGroupBox"> + <property name="title"> + <string extracomment="Palette Editor Preview Widget">Item Views</string> + </property> + <property name="checkable"> + <bool>true</bool> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> + <layout class="QVBoxLayout" name="verticalLayout_5"> <item> - <widget class="QCheckBox" name="CheckBox1" > - <property name="text" > - <string extracomment="Palette Editor Preview Widget">CheckBox1</string> - </property> - <property name="checked" > + <widget class="QTreeWidget" name="treeWidget"> + <property name="alternatingRowColors"> <bool>true</bool> </property> + <column> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">Column 1</string> + </property> + </column> + <item> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">Top Level 1</string> + </property> + <item> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">Nested Item 1</string> + </property> + </item> + <item> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">Nested Item 2</string> + </property> + </item> + <item> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">Nested Item 3</string> + </property> + </item> + </item> </widget> </item> + </layout> + </widget> + </item> + <item row="1" column="0"> + <widget class="QGroupBox" name="simpleGroupBox"> + <property name="title"> + <string extracomment="Palette Editor Preview Widget">Simple Input Widgets</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLineEdit" name="LineEdit1"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">LineEdit</string> + </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="ComboBox1"> + <item> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">ComboBox</string> + </property> + </item> + <item> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">Item1</string> + </property> + </item> + <item> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">Item2</string> + </property> + </item> + </widget> + </item> + </layout> + </item> <item> - <widget class="QCheckBox" name="CheckBox2" > - <property name="text" > - <string extracomment="Palette Editor Preview Widget">CheckBox2</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QSpinBox" name="SpinBox1"/> + </item> + <item> + <widget class="QScrollBar" name="ScrollBar1"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QSlider" name="Slider1"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> </item> - <item row="0" column="0" > - <widget class="QGroupBox" name="ButtonGroup1" > - <property name="title" > - <string extracomment="Palette Editor Preview Widget">ButtonGroup</string> + <item row="1" column="1"> + <widget class="QGroupBox" name="displayGroupBox"> + <property name="title"> + <string extracomment="Palette Editor Preview Widget">Display Widgets</string> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> - <widget class="QRadioButton" name="RadioButton1" > - <property name="text" > - <string extracomment="Palette Editor Preview Widget">RadioButton1</string> + <widget class="QProgressBar" name="ProgressBar1"> + <property name="value"> + <number>50</number> </property> - <property name="checked" > - <bool>true</bool> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QRadioButton" name="RadioButton2" > - <property name="text" > - <string extracomment="Palette Editor Preview Widget">RadioButton2</string> + <widget class="QLabel" name="label"> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">QLabel</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="RadioButton3" > - <property name="text" > - <string extracomment="Palette Editor Preview Widget">RadioButton3</string> + <widget class="QLabel" name="label_2"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="text"> + <string extracomment="Palette Editor Preview Widget">QLabel with frame</string> </property> </widget> </item> diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp index 392f1c3f5..70bbcdb34 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.cpp +++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp @@ -432,7 +432,7 @@ bool PropertyEditor::isItemVisible(QtBrowserItem *item) const * - Anything below (properties) is assumed to be collapsed * That is, the map is required, the state cannot be stored in a set */ -void PropertyEditor::storePropertiesExpansionState(const QList<QtBrowserItem *> &items) +void PropertyEditor::storePropertiesExpansionState(const QVector<QtBrowserItem *> &items) { const QChar bar = QLatin1Char('|'); for (QtBrowserItem *propertyItem : items) { @@ -475,7 +475,7 @@ void PropertyEditor::collapseAll() setExpanded(group, false); } -void PropertyEditor::applyPropertiesExpansionState(const QList<QtBrowserItem *> &items) +void PropertyEditor::applyPropertiesExpansionState(const QVector<QtBrowserItem *> &items) { const QChar bar = QLatin1Char('|'); for (QtBrowserItem *propertyItem : items) { @@ -516,7 +516,7 @@ void PropertyEditor::applyExpansionState() } } -int PropertyEditor::applyPropertiesFilter(const QList<QtBrowserItem *> &items) +int PropertyEditor::applyPropertiesFilter(const QVector<QtBrowserItem *> &items) { int showCount = 0; const bool matchAll = m_filterPattern.isEmpty(); @@ -1011,7 +1011,7 @@ void PropertyEditor::setObject(QObject *object) m_updatingBrowser = false; } else if (type == DesignerPropertyManager::designerFlagTypeId()) { const PropertySheetFlagValue f = qvariant_cast<PropertySheetFlagValue>(value); - QList<QPair<QString, uint> > flags; + QVector<QPair<QString, uint> > flags; for (const QString &name : f.metaFlags.keys()) { const uint val = f.metaFlags.keyToValue(name); flags.append(qMakePair(name, val)); diff --git a/src/designer/src/components/propertyeditor/propertyeditor.h b/src/designer/src/components/propertyeditor/propertyeditor.h index 993c4418d..0d5ade2d2 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.h +++ b/src/designer/src/components/propertyeditor/propertyeditor.h @@ -108,10 +108,10 @@ private: QString realClassName(QObject *object) const; void storeExpansionState(); void applyExpansionState(); - void storePropertiesExpansionState(const QList<QtBrowserItem *> &items); - void applyPropertiesExpansionState(const QList<QtBrowserItem *> &items); + void storePropertiesExpansionState(const QVector<QtBrowserItem *> &items); + void applyPropertiesExpansionState(const QVector<QtBrowserItem *> &items); void applyFilter(); - int applyPropertiesFilter(const QList<QtBrowserItem *> &items); + int applyPropertiesFilter(const QVector<QtBrowserItem *> &items); void setExpanded(QtBrowserItem *item, bool expanded); bool isExpanded(QtBrowserItem *item) const; void setItemVisible(QtBrowserItem *item, bool visible); @@ -157,7 +157,7 @@ private: QMap<QString, QtVariantProperty*> m_nameToProperty; QMap<QtProperty*, QString> m_propertyToGroup; QMap<QString, QtVariantProperty*> m_nameToGroup; - QList<QtProperty *> m_groups; + QVector<QtProperty *> m_groups; QtProperty *m_dynamicGroup = nullptr; QString m_recentlyAddedDynamicProperty; bool m_updatingBrowser = false; diff --git a/src/designer/src/components/signalsloteditor/signalslot_utils_p.h b/src/designer/src/components/signalsloteditor/signalslot_utils_p.h index 7ab98c3d4..ef0c52a80 100644 --- a/src/designer/src/components/signalsloteditor/signalslot_utils_p.h +++ b/src/designer/src/components/signalsloteditor/signalslot_utils_p.h @@ -71,7 +71,7 @@ struct ClassMemberFunctions QStringList m_memberList; }; -using ClassesMemberFunctions = QList<ClassMemberFunctions>; +using ClassesMemberFunctions = QVector<ClassMemberFunctions>; // Return classes and members in reverse class order to // populate of the combo of the ToolWindow. diff --git a/src/designer/src/components/taskmenu/button_taskmenu.cpp b/src/designer/src/components/taskmenu/button_taskmenu.cpp index 80e9d45c3..9940fcfdc 100644 --- a/src/designer/src/components/taskmenu/button_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp @@ -56,8 +56,8 @@ namespace qdesigner_internal { enum { debugButtonMenu = 0 }; -using ButtonList = QList<QAbstractButton *>; -using ButtonGroupList = QList<QButtonGroup *>; +using ButtonList = QVector<QAbstractButton *>; +using ButtonGroupList = QVector<QButtonGroup *>; // ButtonGroupCommand: Base for commands handling button groups and button lists // addButtonsToGroup() and removeButtonsFromGroup() are low-level helpers for @@ -363,7 +363,7 @@ QAction *ButtonGroupTaskMenu::preferredEditAction() const return m_menu.selectGroupAction(); } -QList<QAction*> ButtonGroupTaskMenu::taskActions() const +QVector<QAction*> ButtonGroupTaskMenu::taskActions() const { m_menu.initialize(QDesignerFormWindowInterface::findFormWindow(m_buttonGroup), m_buttonGroup); return m_taskActions; @@ -509,7 +509,7 @@ bool ButtonTaskMenu::refreshAssignMenu(const QDesignerFormWindowInterface *fw, i return !m_assignGroupSubMenu->isEmpty(); } -QList<QAction*> ButtonTaskMenu::taskActions() const +QVector<QAction*> ButtonTaskMenu::taskActions() const { ButtonTaskMenu *ncThis = const_cast<ButtonTaskMenu*>(this); QButtonGroup *buttonGroup = nullptr; diff --git a/src/designer/src/components/taskmenu/button_taskmenu.h b/src/designer/src/components/taskmenu/button_taskmenu.h index ab58c0630..6123543a7 100644 --- a/src/designer/src/components/taskmenu/button_taskmenu.h +++ b/src/designer/src/components/taskmenu/button_taskmenu.h @@ -84,11 +84,11 @@ public: explicit ButtonGroupTaskMenu(QButtonGroup *buttonGroup, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private: QButtonGroup *m_buttonGroup; - QList<QAction*> m_taskActions; + QVector<QAction*> m_taskActions; mutable ButtonGroupMenu m_menu; }; @@ -102,7 +102,7 @@ public: ~ButtonTaskMenu() override; QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; QAbstractButton *button() const; @@ -125,7 +125,7 @@ private: bool refreshAssignMenu(const QDesignerFormWindowInterface *fw, int buttonCount, SelectionType st, QButtonGroup *currentGroup); QMenu *createGroupSelectionMenu(const QDesignerFormWindowInterface *fw); - QList<QAction*> m_taskActions; + QVector<QAction*> m_taskActions; mutable ButtonGroupMenu m_groupMenu; QMenu *m_assignGroupSubMenu; QActionGroup *m_assignActionGroup; diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp index 6d96e9795..dbf367529 100644 --- a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp @@ -68,7 +68,7 @@ QAction *ComboBoxTaskMenu::preferredEditAction() const return m_editItemsAction; } -QList<QAction*> ComboBoxTaskMenu::taskActions() const +QVector<QAction*> ComboBoxTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.h b/src/designer/src/components/taskmenu/combobox_taskmenu.h index 8ff36c1a8..6bb97398f 100644 --- a/src/designer/src/components/taskmenu/combobox_taskmenu.h +++ b/src/designer/src/components/taskmenu/combobox_taskmenu.h @@ -51,7 +51,7 @@ public: ~ComboBoxTaskMenu() override; QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private slots: void editItems(); @@ -61,7 +61,7 @@ private: QComboBox *m_comboBox; QPointer<QDesignerFormWindowInterface> m_formWindow; QPointer<QLineEdit> m_editor; - mutable QList<QAction*> m_taskActions; + mutable QVector<QAction*> m_taskActions; QAction *m_editItemsAction; }; diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp index b4cd1cb2b..47d03e794 100644 --- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp @@ -145,7 +145,7 @@ QString ContainerWidgetTaskMenu::pageMenuText(ContainerType ct, int index, int c return tr("Page %1 of %2").arg(index + 1).arg(count); } -QList<QAction*> ContainerWidgetTaskMenu::taskActions() const +QVector<QAction*> ContainerWidgetTaskMenu::taskActions() const { const QDesignerContainerExtension *ce = containerExtension(); const int index = ce->currentIndex(); @@ -231,7 +231,7 @@ WizardContainerWidgetTaskMenu::WizardContainerWidgetTaskMenu(QWizard *w, QObject l.push_front(createSeparator()); } -QList<QAction*> WizardContainerWidgetTaskMenu::taskActions() const +QVector<QAction*> WizardContainerWidgetTaskMenu::taskActions() const { // Enable const QDesignerContainerExtension *ce = containerExtension(); @@ -269,7 +269,7 @@ void MdiContainerWidgetTaskMenu::initializeActions() l.push_front(createSeparator()); } -QList<QAction*> MdiContainerWidgetTaskMenu::taskActions() const +QVector<QAction*> MdiContainerWidgetTaskMenu::taskActions() const { const auto rc = ContainerWidgetTaskMenu::taskActions(); // Enable diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h index b0f4127ee..5a96cf9ac 100644 --- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h @@ -60,7 +60,7 @@ public: ~ContainerWidgetTaskMenu() override; QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private slots: void removeCurrentPage(); @@ -69,7 +69,7 @@ private slots: protected: QDesignerContainerExtension *containerExtension() const; - QList<QAction*> &containerActions() { return m_taskActions; } + QVector<QAction*> &containerActions() { return m_taskActions; } int pageCount() const; private: @@ -85,7 +85,7 @@ private: PromotionTaskMenu *m_pagePromotionTaskMenu; QAction *m_pageMenuAction; QMenu *m_pageMenu; - QList<QAction*> m_taskActions; + QVector<QAction*> m_taskActions; QAction *m_actionInsertPageAfter; QAction *m_actionInsertPage; QAction *m_actionDeletePage; @@ -99,7 +99,7 @@ class WizardContainerWidgetTaskMenu : public ContainerWidgetTaskMenu { public: explicit WizardContainerWidgetTaskMenu(QWizard *w, QObject *parent = nullptr); - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private: QAction *m_nextAction; @@ -114,7 +114,7 @@ class MdiContainerWidgetTaskMenu : public ContainerWidgetTaskMenu { public: explicit MdiContainerWidgetTaskMenu(QMdiArea *m, QObject *parent = nullptr); - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private: void initializeActions(); diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp index 3b7629908..c40f77468 100644 --- a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp @@ -78,7 +78,7 @@ GroupBoxTaskMenu::GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent) m_taskActions.append(sep); } -QList<QAction*> GroupBoxTaskMenu::taskActions() const +QVector<QAction*> GroupBoxTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.h b/src/designer/src/components/taskmenu/groupbox_taskmenu.h index e09a883a0..d963e44a8 100644 --- a/src/designer/src/components/taskmenu/groupbox_taskmenu.h +++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.h @@ -49,11 +49,11 @@ public: explicit GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private: QAction *m_editTitleAction; - QList<QAction*> m_taskActions; + QVector<QAction*> m_taskActions; }; typedef ExtensionFactory<QDesignerTaskMenuExtension, QGroupBox, GroupBoxTaskMenu> GroupBoxTaskMenuFactory; diff --git a/src/designer/src/components/taskmenu/itemlisteditor.h b/src/designer/src/components/taskmenu/itemlisteditor.h index 97bcb19d9..ebdfa37b4 100644 --- a/src/designer/src/components/taskmenu/itemlisteditor.h +++ b/src/designer/src/components/taskmenu/itemlisteditor.h @@ -99,8 +99,8 @@ protected: DesignerEditorFactory *m_editorFactory; QSplitter *m_propertySplitter = nullptr; QtTreePropertyBrowser *m_propertyBrowser; - QList<QtVariantProperty*> m_properties; - QList<QtVariantProperty*> m_rootProperties; + QVector<QtVariantProperty*> m_properties; + QVector<QtVariantProperty*> m_rootProperties; QHash<QtVariantProperty*, int> m_propertyToRole; bool m_updatingBrowser = false; }; diff --git a/src/designer/src/components/taskmenu/label_taskmenu.cpp b/src/designer/src/components/taskmenu/label_taskmenu.cpp index b46a2a64e..c446e5ab1 100644 --- a/src/designer/src/components/taskmenu/label_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp @@ -90,7 +90,7 @@ QAction *LabelTaskMenu::preferredEditAction() const return Qt::mightBeRichText(m_label->text()) ? m_editRichTextAction : m_editPlainTextAction; } -QList<QAction*> LabelTaskMenu::taskActions() const +QVector<QAction*> LabelTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/label_taskmenu.h b/src/designer/src/components/taskmenu/label_taskmenu.h index a1744b583..394243916 100644 --- a/src/designer/src/components/taskmenu/label_taskmenu.h +++ b/src/designer/src/components/taskmenu/label_taskmenu.h @@ -48,14 +48,14 @@ public: explicit LabelTaskMenu(QLabel *button, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private slots: void editRichText(); private: QLabel *m_label; - QList<QAction*> m_taskActions; + QVector<QAction*> m_taskActions; QAction *m_editRichTextAction; QAction *m_editPlainTextAction; }; diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.cpp b/src/designer/src/components/taskmenu/layouttaskmenu.cpp index b69051212..82a1a9687 100644 --- a/src/designer/src/components/taskmenu/layouttaskmenu.cpp +++ b/src/designer/src/components/taskmenu/layouttaskmenu.cpp @@ -51,9 +51,9 @@ QAction *LayoutWidgetTaskMenu::preferredEditAction() const return m_formLayoutMenu->preferredEditAction(m_widget, m_widget->formWindow()); } -QList<QAction*> LayoutWidgetTaskMenu::taskActions() const +QVector<QAction*> LayoutWidgetTaskMenu::taskActions() const { - QList<QAction*> rc; + QVector<QAction*> rc; QDesignerFormWindowInterface *fw = m_widget->formWindow(); m_morphMenu->populate(m_widget, fw, rc); m_formLayoutMenu->populate(m_widget, fw, rc); @@ -71,7 +71,7 @@ QAction *SpacerTaskMenu::preferredEditAction() const return nullptr; } -QList<QAction*> SpacerTaskMenu::taskActions() const +QVector<QAction*> SpacerTaskMenu::taskActions() const { return {}; } diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.h b/src/designer/src/components/taskmenu/layouttaskmenu.h index afd1afe0f..523477719 100644 --- a/src/designer/src/components/taskmenu/layouttaskmenu.h +++ b/src/designer/src/components/taskmenu/layouttaskmenu.h @@ -51,7 +51,7 @@ public: explicit LayoutWidgetTaskMenu(QLayoutWidget *w, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private: QLayoutWidget *m_widget; @@ -68,7 +68,7 @@ public: explicit SpacerTaskMenu(Spacer *bar, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; }; diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp index cbe2f3e2f..5315f59d8 100644 --- a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp @@ -80,7 +80,7 @@ QAction *LineEditTaskMenu::preferredEditAction() const return m_editTextAction; } -QList<QAction*> LineEditTaskMenu::taskActions() const +QVector<QAction*> LineEditTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.h b/src/designer/src/components/taskmenu/lineedit_taskmenu.h index e28ab7336..4c67c4884 100644 --- a/src/designer/src/components/taskmenu/lineedit_taskmenu.h +++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.h @@ -46,10 +46,10 @@ public: explicit LineEditTaskMenu(QLineEdit *button, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private: - QList<QAction*> m_taskActions; + QVector<QAction*> m_taskActions; QAction *m_editTextAction; }; diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp index 74bff711d..323b3da7a 100644 --- a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp @@ -67,7 +67,7 @@ QAction *ListWidgetTaskMenu::preferredEditAction() const return m_editItemsAction; } -QList<QAction*> ListWidgetTaskMenu::taskActions() const +QVector<QAction*> ListWidgetTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.h b/src/designer/src/components/taskmenu/listwidget_taskmenu.h index 63708be61..f28df59de 100644 --- a/src/designer/src/components/taskmenu/listwidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.h @@ -50,7 +50,7 @@ public: ~ListWidgetTaskMenu() override; QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private slots: void editItems(); @@ -60,7 +60,7 @@ private: QListWidget *m_listWidget; QPointer<QDesignerFormWindowInterface> m_formWindow; QPointer<QLineEdit> m_editor; - mutable QList<QAction*> m_taskActions; + mutable QVector<QAction*> m_taskActions; QAction *m_editItemsAction; }; diff --git a/src/designer/src/components/taskmenu/menutaskmenu.cpp b/src/designer/src/components/taskmenu/menutaskmenu.cpp index 105c3eabd..73efae9d2 100644 --- a/src/designer/src/components/taskmenu/menutaskmenu.cpp +++ b/src/designer/src/components/taskmenu/menutaskmenu.cpp @@ -51,9 +51,9 @@ namespace qdesigner_internal { return nullptr; } - QList<QAction*> MenuTaskMenu::taskActions() const + QVector<QAction*> MenuTaskMenu::taskActions() const { - QList<QAction*> rc; + QVector<QAction*> rc; rc.push_back(m_removeAction); m_promotionTaskMenu->addActions(PromotionTaskMenu::LeadingSeparator, rc); return rc; @@ -84,7 +84,7 @@ namespace qdesigner_internal { return nullptr; } - QList<QAction*> MenuBarTaskMenu::taskActions() const + QVector<QAction*> MenuBarTaskMenu::taskActions() const { return m_bar->contextMenuActions(); } diff --git a/src/designer/src/components/taskmenu/menutaskmenu.h b/src/designer/src/components/taskmenu/menutaskmenu.h index 935836896..fa9e8ad32 100644 --- a/src/designer/src/components/taskmenu/menutaskmenu.h +++ b/src/designer/src/components/taskmenu/menutaskmenu.h @@ -55,7 +55,7 @@ public: explicit MenuTaskMenu(QDesignerMenu *menu, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private slots: void removeMenu(); @@ -77,7 +77,7 @@ public: explicit MenuBarTaskMenu(QDesignerMenuBar *bar, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private: QDesignerMenuBar *m_bar; diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp index 25bc6ce40..aad9aede0 100644 --- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp @@ -66,7 +66,7 @@ QAction *TableWidgetTaskMenu::preferredEditAction() const return m_editItemsAction; } -QList<QAction*> TableWidgetTaskMenu::taskActions() const +QVector<QAction*> TableWidgetTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h index b4d5462f2..c68dd4afa 100644 --- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h @@ -50,7 +50,7 @@ public: ~TableWidgetTaskMenu() override; QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private slots: void editItems(); @@ -60,7 +60,7 @@ private: QTableWidget *m_tableWidget; QPointer<QDesignerFormWindowInterface> m_formWindow; QPointer<QLineEdit> m_editor; - mutable QList<QAction*> m_taskActions; + mutable QVector<QAction*> m_taskActions; QAction *m_editItemsAction; }; diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp index ca5d5d526..b2c6f8e10 100644 --- a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp @@ -76,7 +76,7 @@ QAction *TextEditTaskMenu::preferredEditAction() const return m_editTextAction; } -QList<QAction*> TextEditTaskMenu::taskActions() const +QVector<QAction*> TextEditTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.h b/src/designer/src/components/taskmenu/textedit_taskmenu.h index 2e50b8ca1..77517c8da 100644 --- a/src/designer/src/components/taskmenu/textedit_taskmenu.h +++ b/src/designer/src/components/taskmenu/textedit_taskmenu.h @@ -51,7 +51,7 @@ public: ~TextEditTaskMenu() override; QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private slots: void editText(); @@ -63,7 +63,7 @@ private: const QString m_property; const QString m_windowTitle; - mutable QList<QAction*> m_taskActions; + mutable QVector<QAction*> m_taskActions; QAction *m_editTextAction; }; diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp index 42f3b271a..6ac558546 100644 --- a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp @@ -54,7 +54,7 @@ namespace qdesigner_internal { return nullptr; } - QList<QAction*> ToolBarTaskMenu::taskActions() const + QVector<QAction*> ToolBarTaskMenu::taskActions() const { if (ToolBarEventFilter *ef = ToolBarEventFilter::eventFilterOf(m_toolBar)) return ef->contextMenuActions(); @@ -76,9 +76,9 @@ namespace qdesigner_internal { return nullptr; } - QList<QAction*> StatusBarTaskMenu::taskActions() const + QVector<QAction*> StatusBarTaskMenu::taskActions() const { - QList<QAction*> rc; + QVector<QAction*> rc; rc.push_back(m_removeAction); m_promotionTaskMenu->addActions(PromotionTaskMenu::LeadingSeparator, rc); return rc; diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.h b/src/designer/src/components/taskmenu/toolbar_taskmenu.h index 3e8d5909b..0c3f5592f 100644 --- a/src/designer/src/components/taskmenu/toolbar_taskmenu.h +++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.h @@ -50,7 +50,7 @@ public: explicit ToolBarTaskMenu(QToolBar *tb, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private: QToolBar *m_toolBar; @@ -65,7 +65,7 @@ public: explicit StatusBarTaskMenu(QStatusBar *tb, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private slots: void removeStatusBar(); diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp index c4ffd4ca5..e0c14a4bc 100644 --- a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp @@ -65,7 +65,7 @@ QAction *TreeWidgetTaskMenu::preferredEditAction() const return m_editItemsAction; } -QList<QAction*> TreeWidgetTaskMenu::taskActions() const +QVector<QAction*> TreeWidgetTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.h b/src/designer/src/components/taskmenu/treewidget_taskmenu.h index 9a9c882df..b64401d76 100644 --- a/src/designer/src/components/taskmenu/treewidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.h @@ -50,7 +50,7 @@ public: ~TreeWidgetTaskMenu() override; QAction *preferredEditAction() const override; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private slots: void editItems(); @@ -60,7 +60,7 @@ private: QTreeWidget *m_treeWidget; QPointer<QDesignerFormWindowInterface> m_formWindow; QPointer<QLineEdit> m_editor; - mutable QList<QAction*> m_taskActions; + mutable QVector<QAction*> m_taskActions; QAction *m_editItemsAction; }; diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.cpp b/src/designer/src/components/taskmenu/treewidgeteditor.cpp index 5e77939e5..8a70a7d33 100644 --- a/src/designer/src/components/taskmenu/treewidgeteditor.cpp +++ b/src/designer/src/components/taskmenu/treewidgeteditor.cpp @@ -153,7 +153,7 @@ TreeWidgetContents TreeWidgetEditor::fillContentsFromTreeWidget(QTreeWidget *tre treeCont.m_headerItem.applyToListWidget(m_columnEditor->listWidget(), iconCache(), true); m_columnEditor->setupEditor(treeWidget, treeHeaderPropList); - QList<QtVariantProperty*> rootProperties; + QVector<QtVariantProperty*> rootProperties; rootProperties.append(setupPropertyGroup(tr("Per column properties"), treeItemColumnPropList)); rootProperties.append(setupPropertyGroup(tr("Common properties"), treeItemCommonPropList)); m_rootProperties = rootProperties; @@ -498,7 +498,7 @@ void TreeWidgetEditor::moveColumnItems(const PropertyDefinition *propList, { BoolBlocker block(m_updatingBrowser); - QList<QVariant> saveCol; + QVector<QVariant> saveCol; for (int j = 0; propList[j].name; j++) saveCol.append(item->data(toColumn, propList[j].role)); QVariant editVariant = item->data(toColumn, Qt::EditRole); diff --git a/src/designer/src/components/widgetbox/widgetbox.cpp b/src/designer/src/components/widgetbox/widgetbox.cpp index 4415c4dbe..70c5923aa 100644 --- a/src/designer/src/components/widgetbox/widgetbox.cpp +++ b/src/designer/src/components/widgetbox/widgetbox.cpp @@ -132,7 +132,7 @@ void WidgetBox::handleMousePress(const QString &name, const QString &xml, const DomUI *ui = xmlToUi(name, xml, true); if (ui == nullptr) return; - QList<QDesignerDnDItemInterface*> item_list; + QVector<QDesignerDnDItemInterface*> item_list; item_list.append(new WidgetBoxDnDItem(core(), ui, global_mouse_pos)); m_core->formWindowManager()->dragItems(item_list); } @@ -177,7 +177,7 @@ void WidgetBox::removeWidget(int cat_idx, int wgt_idx) m_view->removeWidget(cat_idx, wgt_idx); } -void WidgetBox::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint&) +void WidgetBox::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, const QPoint&) { m_view->dropWidgets(item_list); } diff --git a/src/designer/src/components/widgetbox/widgetbox.h b/src/designer/src/components/widgetbox/widgetbox.h index 27e1b461a..aa687498e 100644 --- a/src/designer/src/components/widgetbox/widgetbox.h +++ b/src/designer/src/components/widgetbox/widgetbox.h @@ -61,7 +61,7 @@ public: void addWidget(int cat_idx, const Widget &wgt) override; void removeWidget(int cat_idx, int wgt_idx) override; - void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) override; + void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) override; void setFileName(const QString &file_name) override; QString fileName() const override; diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h index 657dad148..16e651dc2 100644 --- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h +++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h @@ -58,7 +58,7 @@ public: explicit WidgetBoxCategoryListView(QDesignerFormEditorInterface *core, QWidget *parent = nullptr); void setViewMode(ViewMode vm); - void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list); + void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list); using QListView::contentsSize; diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp index 054d622a0..fc28aa222 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp @@ -900,7 +900,7 @@ void WidgetBoxTreeWidget::contextMenuEvent(QContextMenuEvent *e) menu.exec(mapToGlobal(e->pos())); } -void WidgetBoxTreeWidget::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list) +void WidgetBoxTreeWidget::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list) { QTreeWidgetItem *scratch_item = nullptr; WidgetBoxCategoryListView *categoryView = nullptr; diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.h b/src/designer/src/components/widgetbox/widgetboxtreewidget.h index 0961e658d..2262b50bd 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.h +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.h @@ -72,7 +72,7 @@ public: void addWidget(int cat_idx, const Widget &wgt); void removeWidget(int cat_idx, int wgt_idx); - void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list); + void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list); void setFileName(const QString &file_name); QString fileName() const; diff --git a/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp b/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp index 259eb4668..03e1a96bd 100644 --- a/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp +++ b/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp @@ -55,7 +55,7 @@ //! [1] - QList<QDesignerFormWindowInterface *> forms; + QVector<QDesignerFormWindowInterface *> forms; QDesignerFormWindowInterface *formWindow; QDesignerFormWindowManagerInterface *manager = formEditor->formWindowManager(); diff --git a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp index 1f76bc71d..f7d789ed6 100644 --- a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp +++ b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp @@ -183,7 +183,7 @@ public: MyTaskMenuExtension(MyCustomWidget *widget, QObject *parent); QAction *preferredEditAction() const; - QList<QAction *> taskActions() const; + QVector<QAction *> taskActions() const; private slots: void mySlot(); @@ -246,10 +246,10 @@ class MyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInt public: MyCustomWidgets(QObject *parent = 0); - QList<QDesignerCustomWidgetInterface*> customWidgets() const override; + QVector<QDesignerCustomWidgetInterface*> customWidgets() const override; private: - QList<QDesignerCustomWidgetInterface*> widgets; + QVector<QDesignerCustomWidgetInterface*> widgets; }; //! [12] @@ -263,7 +263,7 @@ MyCustomWidgets::MyCustomWidgets(QObject *parent) widgets.append(new CustomWidgetThreeInterface(this)); } -QList<QDesignerCustomWidgetInterface*> MyCustomWidgets::customWidgets() const +QVector<QDesignerCustomWidgetInterface*> MyCustomWidgets::customWidgets() const { return widgets; } diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp index dba96fd86..8e2e4dc0f 100644 --- a/src/designer/src/designer/mainwindow.cpp +++ b/src/designer/src/designer/mainwindow.cpp @@ -56,7 +56,7 @@ static const char *uriListMimeFormatC = "text/uri-list"; QT_BEGIN_NAMESPACE -using ActionList = QList<QAction *>; +using ActionList = QVector<QAction *>; // Helpers for creating toolbars and menu diff --git a/src/designer/src/designer/preferencesdialog.h b/src/designer/src/designer/preferencesdialog.h index 654e93388..b7b20d90e 100644 --- a/src/designer/src/designer/preferencesdialog.h +++ b/src/designer/src/designer/preferencesdialog.h @@ -61,7 +61,7 @@ private: Ui::PreferencesDialog *m_ui; QDesignerFormEditorInterface *m_core; - QList<QDesignerOptionsPageInterface*> m_optionsPages; + QVector<QDesignerOptionsPageInterface*> m_optionsPages; }; QT_END_NAMESPACE diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index ea296fc27..cfb9e5cac 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -120,7 +120,7 @@ static QActionGroup *createActionGroup(QObject *parent, bool exclusive = false) return rc; } -static void fixActionContext(const QList<QAction *> &actions) +static void fixActionContext(const QVector<QAction *> &actions) { for (QAction *a : actions) a->setShortcutContext(Qt::ApplicationShortcut); @@ -315,7 +315,7 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench) // m_editWidgetsAction->setCheckable(true); - QList<QKeySequence> shortcuts; + QVector<QKeySequence> shortcuts; shortcuts.append(QKeySequence(Qt::Key_F3)); shortcuts.append(QKeySequence(Qt::Key_Escape)); m_editWidgetsAction->setShortcuts(shortcuts); diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.cpp b/src/designer/src/designer/qdesigner_appearanceoptions.cpp index 66eb49c9f..fbcfacc6e 100644 --- a/src/designer/src/designer/qdesigner_appearanceoptions.cpp +++ b/src/designer/src/designer/qdesigner_appearanceoptions.cpp @@ -65,7 +65,7 @@ QDesignerAppearanceOptionsWidget::QDesignerAppearanceOptionsWidget(QWidget *pare m_ui->m_uiModeCombo->addItem(tr("Docked Window"), QVariant(DockedMode)); m_ui->m_uiModeCombo->addItem(tr("Multiple Top-Level Windows"), QVariant(TopLevelMode)); - connect(m_ui->m_uiModeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), + connect(m_ui->m_uiModeCombo, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &QDesignerAppearanceOptionsWidget::slotUiModeComboChanged); m_ui->m_fontPanel->setCheckable(true); diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index d18d2a179..b3b14d1c0 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE static const char *appFontPrefixC = "AppFonts"; -using ActionList = QList<QAction *>; +using ActionList = QVector<QAction *>; static QMdiSubWindow *mdiSubWindowOf(const QWidget *w) { diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp index 767d25171..8e2e399e0 100644 --- a/src/designer/src/designer/versiondialog.cpp +++ b/src/designer/src/designer/versiondialog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. @@ -160,7 +160,7 @@ VersionDialog::VersionDialog(QWidget *parent) lbl->setText(tr("%1" "<br/>Copyright (C) %2 The Qt Company Ltd." - ).arg(version, QStringLiteral("2019"))); + ).arg(version, QStringLiteral("2020"))); lbl->setWordWrap(true); lbl->setOpenExternalLinks(true); diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h index 49dd56224..b0cef39d5 100644 --- a/src/designer/src/lib/extension/qextensionmanager.h +++ b/src/designer/src/lib/extension/qextensionmanager.h @@ -51,7 +51,7 @@ public: QObject *extension(QObject *object, const QString &iid) const override; private: - using FactoryList = QList<QAbstractExtensionFactory *>; + using FactoryList = QVector<QAbstractExtensionFactory *>; typedef QHash<QString, FactoryList> FactoryMap; FactoryMap m_extensions; FactoryList m_globalExtension; diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro index de0dc7389..870f752e8 100644 --- a/src/designer/src/lib/lib.pro +++ b/src/designer/src/lib/lib.pro @@ -2,6 +2,7 @@ TARGET = QtDesigner MODULE = designer QT = core-private gui-private widgets-private xml uiplugin +qtHaveModule(openglwidgets): QT += openglwidgets DEFINES += \ QDESIGNER_SDK_LIBRARY \ diff --git a/src/designer/src/lib/sdk/abstractformeditor.cpp b/src/designer/src/lib/sdk/abstractformeditor.cpp index 2d4b20812..0b62e6d1a 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.cpp +++ b/src/designer/src/lib/sdk/abstractformeditor.cpp @@ -96,7 +96,7 @@ public: QDesignerDialogGuiInterface *m_dialogGui = nullptr; QPointer<QtResourceModel> m_resourceModel; QPointer<QtGradientManager> m_gradientManager; // instantiated and deleted by designer_integration - QList<QDesignerOptionsPageInterface*> m_optionsPages; + QVector<QDesignerOptionsPageInterface*> m_optionsPages; }; QDesignerFormEditorInterfacePrivate::QDesignerFormEditorInterfacePrivate() = default; @@ -399,7 +399,7 @@ void QDesignerFormEditorInterface::setIntegration(QDesignerIntegrationInterface \since 4.5 Returns the list of options pages that allow the user to configure \QD components. */ -QList<QDesignerOptionsPageInterface*> QDesignerFormEditorInterface::optionsPages() const +QVector<QDesignerOptionsPageInterface*> QDesignerFormEditorInterface::optionsPages() const { return d->m_optionsPages; } @@ -409,7 +409,7 @@ QList<QDesignerOptionsPageInterface*> QDesignerFormEditorInterface::optionsPages \since 4.5 Sets the list of options pages that allow the user to configure \QD components. */ -void QDesignerFormEditorInterface::setOptionsPages(const QList<QDesignerOptionsPageInterface*> &optionsPages) +void QDesignerFormEditorInterface::setOptionsPages(const QVector<QDesignerOptionsPageInterface*> &optionsPages) { d->m_optionsPages = optionsPages; } diff --git a/src/designer/src/lib/sdk/abstractformeditor.h b/src/designer/src/lib/sdk/abstractformeditor.h index 39f5054cc..05d503403 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.h +++ b/src/designer/src/lib/sdk/abstractformeditor.h @@ -88,7 +88,7 @@ public: QString resourceLocation() const; QtResourceModel *resourceModel() const; QtGradientManager *gradientManager() const; - QList<QDesignerOptionsPageInterface*> optionsPages() const; + QVector<QDesignerOptionsPageInterface*> optionsPages() const; void setTopLevel(QWidget *topLevel); void setWidgetBox(QDesignerWidgetBoxInterface *widgetBox); @@ -102,7 +102,7 @@ public: void setSettingsManager(QDesignerSettingsInterface *settingsManager); void setResourceModel(QtResourceModel *model); void setGradientManager(QtGradientManager *manager); - void setOptionsPages(const QList<QDesignerOptionsPageInterface*> &optionsPages); + void setOptionsPages(const QVector<QDesignerOptionsPageInterface*> &optionsPages); QObjectList pluginInstances() const; diff --git a/src/designer/src/lib/sdk/abstractformwindow.cpp b/src/designer/src/lib/sdk/abstractformwindow.cpp index 0b24920aa..f1b2f335f 100644 --- a/src/designer/src/lib/sdk/abstractformwindow.cpp +++ b/src/designer/src/lib/sdk/abstractformwindow.cpp @@ -609,7 +609,7 @@ void QDesignerFormWindowInterface::activateResourceFilePaths(const QStringList & */ /*! - \fn virtual void QDesignerFormWindowInterface::simplifySelection(QList<QWidget*> *widgets) const + \fn virtual void QDesignerFormWindowInterface::simplifySelection(QVector<QWidget*> *widgets) const Simplifies the selection of widgets specified by \a widgets. diff --git a/src/designer/src/lib/sdk/abstractformwindow.h b/src/designer/src/lib/sdk/abstractformwindow.h index 63aeaada8..de23917a7 100644 --- a/src/designer/src/lib/sdk/abstractformwindow.h +++ b/src/designer/src/lib/sdk/abstractformwindow.h @@ -133,7 +133,7 @@ public: virtual void beginCommand(const QString &description) = 0; virtual void endCommand() = 0; - virtual void simplifySelection(QList<QWidget*> *widgets) const = 0; + virtual void simplifySelection(QVector<QWidget*> *widgets) const = 0; // notifications virtual void emitSelectionChanged() = 0; diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp index 387f0665c..2ae2711a5 100644 --- a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp +++ b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp @@ -505,7 +505,7 @@ QAction *QDesignerFormWindowManagerInterface::actionRedo() const */ /*! - \fn void QDesignerFormWindowManagerInterface::dragItems(const QList<QDesignerDnDItemInterface*> &item_list) + \fn void QDesignerFormWindowManagerInterface::dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) \internal */ diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.h b/src/designer/src/lib/sdk/abstractformwindowmanager.h index eddba7387..b6fd734c4 100644 --- a/src/designer/src/lib/sdk/abstractformwindowmanager.h +++ b/src/designer/src/lib/sdk/abstractformwindowmanager.h @@ -120,7 +120,7 @@ public: virtual QDesignerFormEditorInterface *core() const = 0; - virtual void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) = 0; + virtual void dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) = 0; virtual QPixmap createPreviewPixmap() const = 0; diff --git a/src/designer/src/lib/sdk/abstractintrospection.cpp b/src/designer/src/lib/sdk/abstractintrospection.cpp index c4e12635a..405796cdc 100644 --- a/src/designer/src/lib/sdk/abstractintrospection.cpp +++ b/src/designer/src/lib/sdk/abstractintrospection.cpp @@ -197,9 +197,9 @@ QDesignerMetaPropertyInterface::~QDesignerMetaPropertyInterface() = default; */ /*! - \fn Attributes QDesignerMetaPropertyInterface::attributes(const QObject *object) const + \fn Attributes QDesignerMetaPropertyInterface::attributes() const - Returns the attributes of the property for the gives \a object. + Returns the attributes of the property. */ /*! diff --git a/src/designer/src/lib/sdk/abstractintrospection_p.h b/src/designer/src/lib/sdk/abstractintrospection_p.h index 89047651c..985bba830 100644 --- a/src/designer/src/lib/sdk/abstractintrospection_p.h +++ b/src/designer/src/lib/sdk/abstractintrospection_p.h @@ -84,7 +84,7 @@ public: virtual Kind kind() const = 0; virtual AccessFlags accessFlags() const = 0; - virtual Attributes attributes(const QObject *object = nullptr) const = 0; + virtual Attributes attributes() const = 0; virtual QVariant::Type type() const = 0; virtual QString name() const = 0; diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.cpp b/src/designer/src/lib/sdk/abstractmetadatabase.cpp index 3ba2d5804..df28d91b6 100644 --- a/src/designer/src/lib/sdk/abstractmetadatabase.cpp +++ b/src/designer/src/lib/sdk/abstractmetadatabase.cpp @@ -71,7 +71,7 @@ QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() = default; */ /*! - \fn QList<QObject*> QDesignerMetaDataBaseInterface::objects() const + \fn QVector<QObject*> QDesignerMetaDataBaseInterface::objects() const Returns the list of objects that have corresponding items in the meta database. */ @@ -119,7 +119,7 @@ QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() = default; */ /*! - \fn QList<QWidget*> QDesignerMetaDataBaseItemInterface::tabOrder() const + \fn QVector<QWidget*> QDesignerMetaDataBaseItemInterface::tabOrder() const Returns a list of widgets in the order defined by the form's tab order. @@ -128,7 +128,7 @@ QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() = default; /*! - \fn void QDesignerMetaDataBaseItemInterface::setTabOrder(const QList<QWidget*> &tabOrder) + \fn void QDesignerMetaDataBaseItemInterface::setTabOrder(const QVector<QWidget*> &tabOrder) Sets the tab order in the form using the list of widgets defined by \a tabOrder. diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.h b/src/designer/src/lib/sdk/abstractmetadatabase.h index adeb6c7ee..17e0ac160 100644 --- a/src/designer/src/lib/sdk/abstractmetadatabase.h +++ b/src/designer/src/lib/sdk/abstractmetadatabase.h @@ -53,8 +53,8 @@ public: virtual QString name() const = 0; virtual void setName(const QString &name) = 0; - virtual QList<QWidget*> tabOrder() const = 0; - virtual void setTabOrder(const QList<QWidget*> &tabOrder) = 0; + virtual QVector<QWidget*> tabOrder() const = 0; + virtual void setTabOrder(const QVector<QWidget*> &tabOrder) = 0; virtual bool enabled() const = 0; virtual void setEnabled(bool b) = 0; @@ -72,7 +72,7 @@ public: virtual void add(QObject *object) = 0; virtual void remove(QObject *object) = 0; - virtual QList<QObject*> objects() const = 0; + virtual QVector<QObject*> objects() const = 0; virtual QDesignerFormEditorInterface *core() const = 0; diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp index a8e8ecdb6..d59c7fb3d 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE with an error message in \a errorMessage on failure. */ -/*! \fn virtual QList<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotionInterface::promotionBaseClasses() const +/*! \fn virtual QVector<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotionInterface::promotionBaseClasses() const Return a list of base classes that are suitable for promotion. */ diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.h b/src/designer/src/lib/sdk/abstractpromotioninterface.h index 3ec2a3038..d709c8f03 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.h +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.h @@ -53,7 +53,7 @@ public: QDesignerWidgetDataBaseItemInterface *promotedItem; }; - using PromotedClasses = QList<PromotedClass>; + using PromotedClasses = QVector<PromotedClass>; virtual PromotedClasses promotedClasses() const = 0; @@ -70,7 +70,7 @@ public: virtual bool setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage) = 0; - virtual QList<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const = 0; + virtual QVector<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const = 0; }; QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.cpp b/src/designer/src/lib/sdk/abstractwidgetbox.cpp index 9bdef3c5b..39dad6ec5 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.cpp +++ b/src/designer/src/lib/sdk/abstractwidgetbox.cpp @@ -158,7 +158,7 @@ int QDesignerWidgetBoxInterface::findOrInsertCategory(const QString &categoryNam /*! \internal - \fn void QDesignerWidgetBoxInterface::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) + \fn void QDesignerWidgetBoxInterface::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) */ diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h index 6d038fc6a..846fb8b3d 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.h +++ b/src/designer/src/lib/sdk/abstractwidgetbox.h @@ -72,7 +72,7 @@ public: QSharedDataPointer<QDesignerWidgetBoxWidgetData> m_data; }; - using WidgetList = QList<Widget>; + using WidgetList = QVector<Widget>; class Category { @@ -99,7 +99,7 @@ public: WidgetList m_widget_list; }; - using CategoryList = QList<Category>; + using CategoryList = QVector<Category>; explicit QDesignerWidgetBoxInterface(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); virtual ~QDesignerWidgetBoxInterface(); @@ -116,7 +116,7 @@ public: int findOrInsertCategory(const QString &categoryName); - virtual void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, + virtual void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) = 0; virtual void setFileName(const QString &file_name) = 0; diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp b/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp index a348580ea..581fd464d 100644 --- a/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp +++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp @@ -333,13 +333,13 @@ bool QDesignerWidgetDataBaseInterface::isCustom(QObject *object, bool resolveNam */ /*! - \fn virtual void QDesignerWidgetDataBaseItemInterface::setDefaultPropertyValues(const QList<QVariant> &list) = 0 + \fn virtual void QDesignerWidgetDataBaseItemInterface::setDefaultPropertyValues(const QVector<QVariant> &list) = 0 Sets the default property values for the widget to the given \a list. */ /*! - \fn virtual QList<QVariant> QDesignerWidgetDataBaseItemInterface::defaultPropertyValues() const = 0 + \fn virtual QVector<QVariant> QDesignerWidgetDataBaseItemInterface::defaultPropertyValues() const = 0 Returns a list of default values to be used as properties for the item. */ diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.h b/src/designer/src/lib/sdk/abstractwidgetdatabase.h index c162039fc..3320018cd 100644 --- a/src/designer/src/lib/sdk/abstractwidgetdatabase.h +++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.h @@ -85,8 +85,8 @@ public: virtual QString extends() const = 0; virtual void setExtends(const QString &s) = 0; - virtual void setDefaultPropertyValues(const QList<QVariant> &list) = 0; - virtual QList<QVariant> defaultPropertyValues() const = 0; + virtual void setDefaultPropertyValues(const QVector<QVariant> &list) = 0; + virtual QVector<QVariant> defaultPropertyValues() const = 0; }; class QDESIGNER_SDK_EXPORT QDesignerWidgetDataBaseInterface: public QObject @@ -115,7 +115,7 @@ Q_SIGNALS: void changed(); protected: - QList<QDesignerWidgetDataBaseItemInterface *> m_items; + QVector<QDesignerWidgetDataBaseItemInterface *> m_items; }; QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/layoutdecoration.h b/src/designer/src/lib/sdk/layoutdecoration.h index e893d1947..91f8c06b1 100644 --- a/src/designer/src/lib/sdk/layoutdecoration.h +++ b/src/designer/src/lib/sdk/layoutdecoration.h @@ -57,7 +57,7 @@ public: QDesignerLayoutDecorationExtension() = default; virtual ~QDesignerLayoutDecorationExtension() = default; - virtual QList<QWidget*> widgets(QLayout *layout) const = 0; + virtual QVector<QWidget*> widgets(QLayout *layout) const = 0; virtual QRect itemInfo(int index) const = 0; virtual int indexOf(QWidget *widget) const = 0; diff --git a/src/designer/src/lib/sdk/layoutdecoration.qdoc b/src/designer/src/lib/sdk/layoutdecoration.qdoc index 04beec341..16cd44830 100644 --- a/src/designer/src/lib/sdk/layoutdecoration.qdoc +++ b/src/designer/src/lib/sdk/layoutdecoration.qdoc @@ -49,7 +49,7 @@ */ /*! - \fn virtual QList<QWidget*> QDesignerLayoutDecorationExtension::widgets(QLayout *layout) const + \fn virtual QVector<QWidget*> QDesignerLayoutDecorationExtension::widgets(QLayout *layout) const Returns the widgets that are managed by the given \a layout. diff --git a/src/designer/src/lib/sdk/membersheet.h b/src/designer/src/lib/sdk/membersheet.h index a3a927538..f4d67a9f7 100644 --- a/src/designer/src/lib/sdk/membersheet.h +++ b/src/designer/src/lib/sdk/membersheet.h @@ -65,8 +65,8 @@ public: virtual QString declaredInClass(int index) const = 0; virtual QString signature(int index) const = 0; - virtual QList<QByteArray> parameterTypes(int index) const = 0; - virtual QList<QByteArray> parameterNames(int index) const = 0; + virtual QVector<QByteArray> parameterTypes(int index) const = 0; + virtual QVector<QByteArray> parameterNames(int index) const = 0; }; Q_DECLARE_EXTENSION_INTERFACE(QDesignerMemberSheetExtension, "org.qt-project.Qt.Designer.MemberSheet") diff --git a/src/designer/src/lib/sdk/membersheet.qdoc b/src/designer/src/lib/sdk/membersheet.qdoc index 39fc0caa0..7ad66e38d 100644 --- a/src/designer/src/lib/sdk/membersheet.qdoc +++ b/src/designer/src/lib/sdk/membersheet.qdoc @@ -231,7 +231,7 @@ */ /*! - \fn QList<QByteArray> QDesignerMemberSheetExtension::parameterTypes(int index) const + \fn QVector<QByteArray> QDesignerMemberSheetExtension::parameterTypes(int index) const Returns the parameter types of the member function with the given \a index, as a QByteArray list. @@ -240,7 +240,7 @@ */ /*! - \fn QList<QByteArray> QDesignerMemberSheetExtension::parameterNames(int index) const + \fn QVector<QByteArray> QDesignerMemberSheetExtension::parameterNames(int index) const Returns the parameter names of the member function with the given \a index, as a QByteArray list. diff --git a/src/designer/src/lib/sdk/taskmenu.h b/src/designer/src/lib/sdk/taskmenu.h index fd588baf1..9147f8b3d 100644 --- a/src/designer/src/lib/sdk/taskmenu.h +++ b/src/designer/src/lib/sdk/taskmenu.h @@ -45,7 +45,7 @@ public: virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const = 0; + virtual QVector<QAction*> taskActions() const = 0; }; Q_DECLARE_EXTENSION_INTERFACE(QDesignerTaskMenuExtension, "org.qt-project.Qt.Designer.TaskMenu") diff --git a/src/designer/src/lib/sdk/taskmenu.qdoc b/src/designer/src/lib/sdk/taskmenu.qdoc index b768fc5b2..aec98be51 100644 --- a/src/designer/src/lib/sdk/taskmenu.qdoc +++ b/src/designer/src/lib/sdk/taskmenu.qdoc @@ -128,7 +128,7 @@ */ /*! - \fn QList<QAction*> QDesignerTaskMenuExtension::taskActions() const + \fn QVector<QAction*> QDesignerTaskMenuExtension::taskActions() const Returns the task menu extension as a list of actions which will be included in \QD's task menu when a plugin with the specified diff --git a/src/designer/src/lib/shared/actioneditor_p.h b/src/designer/src/lib/shared/actioneditor_p.h index 2f78887ba..73c70ed2a 100644 --- a/src/designer/src/lib/shared/actioneditor_p.h +++ b/src/designer/src/lib/shared/actioneditor_p.h @@ -122,7 +122,7 @@ signals: void contextMenuRequested(QMenu *menu, QAction *item); private: - using ActionList = QList<QAction *>; + using ActionList = QVector<QAction *>; void deleteActions(QDesignerFormWindowInterface *formWindow, const ActionList &); #if QT_CONFIG(clipboard) void copyActions(QDesignerFormWindowInterface *formWindow, const ActionList &); diff --git a/src/designer/src/lib/shared/actionrepository_p.h b/src/designer/src/lib/shared/actionrepository_p.h index 333093a09..38ca6a7b7 100644 --- a/src/designer/src/lib/shared/actionrepository_p.h +++ b/src/designer/src/lib/shared/actionrepository_p.h @@ -98,7 +98,7 @@ signals: void resourceImageDropped(const QString &path, QAction *action); private: - using QStandardItemList = QList<QStandardItem *>; + using QStandardItemList = QVector<QStandardItem *>; void initializeHeaders(); static void setItems(QDesignerFormEditorInterface *core, QAction *a, @@ -203,7 +203,7 @@ public: QAction *currentAction() const; void setCurrentIndex(const QModelIndex &index); - using ActionList = QList<QAction *>; + using ActionList = QVector<QAction *>; ActionList selectedActions() const; QItemSelection selection() const; @@ -232,7 +232,7 @@ class QDESIGNER_SHARED_EXPORT ActionRepositoryMimeData: public QMimeData { Q_OBJECT public: - using ActionList = QList<QAction *>; + using ActionList = QVector<QAction *>; ActionRepositoryMimeData(const ActionList &, Qt::DropAction dropAction); ActionRepositoryMimeData(QAction *, Qt::DropAction dropAction); diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp index 35b3bbf94..5e43607d4 100644 --- a/src/designer/src/lib/shared/connectionedit.cpp +++ b/src/designer/src/lib/shared/connectionedit.cpp @@ -35,7 +35,7 @@ #include <QtGui/qevent.h> #include <QtGui/qfontmetrics.h> #include <QtGui/qpixmap.h> -#include <QtGui/qmatrix.h> +#include <QtGui/qtransform.h> #include <QtWidgets/qapplication.h> #include <QtWidgets/qmenu.h> #include <QtWidgets/qaction.h> @@ -881,7 +881,7 @@ void Connection::updatePixmap(EndPoint::Type type) const LineDir dir = labelDir(type); if (dir == DownDir) - *pm = pm->transformed(QMatrix(0.0, -1.0, 1.0, 0.0, 0.0, 0.0)); + *pm = pm->transformed(QTransform(0.0, -1.0, 1.0, 0.0, 0.0, 0.0)); } void Connection::checkWidgets() diff --git a/src/designer/src/lib/shared/formlayoutmenu.cpp b/src/designer/src/lib/shared/formlayoutmenu.cpp index 48d6ee488..58631b5db 100644 --- a/src/designer/src/lib/shared/formlayoutmenu.cpp +++ b/src/designer/src/lib/shared/formlayoutmenu.cpp @@ -154,7 +154,7 @@ FormLayoutRowDialog::FormLayoutRowDialog(QDesignerFormEditorInterface *core, m_ui.fieldClassComboBox->addItems(fieldWidgetClasses(core)); m_ui.fieldClassComboBox->setCurrentIndex(0); connect(m_ui.fieldClassComboBox, - QOverload<int>::of(&QComboBox::currentIndexChanged), + QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &FormLayoutRowDialog::fieldClassChanged); updateOkButton(); diff --git a/src/designer/src/lib/shared/formlayoutmenu_p.h b/src/designer/src/lib/shared/formlayoutmenu_p.h index d4b56ac96..9d88d8ced 100644 --- a/src/designer/src/lib/shared/formlayoutmenu_p.h +++ b/src/designer/src/lib/shared/formlayoutmenu_p.h @@ -61,7 +61,7 @@ class QDESIGNER_SHARED_EXPORT FormLayoutMenu : public QObject Q_DISABLE_COPY_MOVE(FormLayoutMenu) Q_OBJECT public: - using ActionList = QList<QAction *>; + using ActionList = QVector<QAction *>; explicit FormLayoutMenu(QObject *parent); diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp index 6814cd04f..7f2dd4d55 100644 --- a/src/designer/src/lib/shared/formwindowbase.cpp +++ b/src/designer/src/lib/shared/formwindowbase.cpp @@ -460,7 +460,7 @@ void FormWindowBase::deleteWidgetList(const QWidgetList &widget_list) QMenu *FormWindowBase::createExtensionTaskMenu(QDesignerFormWindowInterface *fw, QObject *o, bool trailingSeparator) { - using ActionList = QList<QAction *>; + using ActionList = QVector<QAction *>; ActionList actions; // 1) Standard public extension QExtensionManager *em = fw->core()->extensionManager(); diff --git a/src/designer/src/lib/shared/formwindowbase_p.h b/src/designer/src/lib/shared/formwindowbase_p.h index b240aa521..c18ee0021 100644 --- a/src/designer/src/lib/shared/formwindowbase_p.h +++ b/src/designer/src/lib/shared/formwindowbase_p.h @@ -108,7 +108,7 @@ public: // Helper to create a basic popup menu from task menu extensions (internal/public) static QMenu *createExtensionTaskMenu(QDesignerFormWindowInterface *fw, QObject *o, bool trailingSeparator = true); - virtual bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, + virtual bool dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target, const QPoint &global_mouse_pos) = 0; // Helper to find the widget at the mouse position with some flags. diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp index 05aaa9c98..ccfdc5c18 100644 --- a/src/designer/src/lib/shared/iconselector.cpp +++ b/src/designer/src/lib/shared/iconselector.cpp @@ -591,8 +591,7 @@ void IconThemeEditor::updatePreview(const QString &t) { // Update preview label with icon. if (t.isEmpty() || !QIcon::hasThemeIcon(t)) { // Empty - const QPixmap *currentPixmap = d->m_themeLabel->pixmap(); - if (currentPixmap == nullptr || currentPixmap->cacheKey() != d->m_emptyPixmap.cacheKey()) + if (d->m_themeLabel->pixmap(Qt::ReturnByValue).cacheKey() != d->m_emptyPixmap.cacheKey()) d->m_themeLabel->setPixmap(d->m_emptyPixmap); } else { const QIcon icon = QIcon::fromTheme(t); diff --git a/src/designer/src/lib/shared/morphmenu_p.h b/src/designer/src/lib/shared/morphmenu_p.h index eba1bdf3a..58ade96d0 100644 --- a/src/designer/src/lib/shared/morphmenu_p.h +++ b/src/designer/src/lib/shared/morphmenu_p.h @@ -55,7 +55,7 @@ class QDESIGNER_SHARED_EXPORT MorphMenu : public QObject { Q_DISABLE_COPY_MOVE(MorphMenu) Q_OBJECT public: - using ActionList = QList<QAction *>; + using ActionList = QVector<QAction *>; explicit MorphMenu(QObject *parent = nullptr); diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp index dda60fd16..67e08c475 100644 --- a/src/designer/src/lib/shared/newformwidget.cpp +++ b/src/designer/src/lib/shared/newformwidget.cpp @@ -179,7 +179,7 @@ NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent m_deviceProfiles = settings.deviceProfiles(); m_ui->profileComboBox->addItem(tr("None")); connect(m_ui->profileComboBox, - QOverload<int>::of(&QComboBox::currentIndexChanged), + QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &NewFormWidget::slotDeviceProfileIndexChanged); if (m_deviceProfiles.isEmpty()) { m_ui->profileComboBox->setEnabled(false); diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp index 88b581862..c1b601836 100644 --- a/src/designer/src/lib/shared/pluginmanager.cpp +++ b/src/designer/src/lib/shared/pluginmanager.cpp @@ -476,8 +476,8 @@ class QDesignerPluginManagerPrivate { // Synced lists of custom widgets and their data. Note that the list // must be ordered for collections to appear in order. - QList<QDesignerCustomWidgetInterface *> m_customWidgets; - QList<QDesignerCustomWidgetData> m_customWidgetData; + QVector<QDesignerCustomWidgetInterface *> m_customWidgets; + QVector<QDesignerCustomWidgetData> m_customWidgetData; QStringList defaultPluginPaths() const; diff --git a/src/designer/src/lib/shared/pluginmanager_p.h b/src/designer/src/lib/shared/pluginmanager_p.h index 373d0fe51..df264ad02 100644 --- a/src/designer/src/lib/shared/pluginmanager_p.h +++ b/src/designer/src/lib/shared/pluginmanager_p.h @@ -99,7 +99,7 @@ class QDESIGNER_SHARED_EXPORT QDesignerPluginManager: public QObject { Q_OBJECT public: - using CustomWidgetList = QList<QDesignerCustomWidgetInterface *>; + using CustomWidgetList = QVector<QDesignerCustomWidgetInterface *>; explicit QDesignerPluginManager(QDesignerFormEditorInterface *core); ~QDesignerPluginManager() override; diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp index 4aa68d083..1f7649975 100644 --- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp +++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp @@ -317,7 +317,7 @@ PreviewConfigurationWidget::PreviewConfigurationWidget(QDesignerFormEditorInterf this, &PreviewConfigurationWidget::slotEditAppStyleSheet); connect(m_impl->skinRemoveButton(), &QAbstractButton::clicked, this, &PreviewConfigurationWidget::slotDeleteSkinEntry); - connect(m_impl->skinCombo(), QOverload<int>::of(&QComboBox::currentIndexChanged), + connect(m_impl->skinCombo(), QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &PreviewConfigurationWidget::slotSkinChanged); m_impl->retrieveSettings(); diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp index f7947d938..68466d597 100644 --- a/src/designer/src/lib/shared/previewmanager.cpp +++ b/src/designer/src/lib/shared/previewmanager.cpp @@ -54,7 +54,7 @@ #include <QtWidgets/qaction.h> #include <QtWidgets/qactiongroup.h> #include <QtGui/qcursor.h> -#include <QtGui/qmatrix.h> +#include <QtGui/qtransform.h> #include <QtCore/qmap.h> #include <QtCore/qdebug.h> @@ -169,7 +169,7 @@ protected: virtual void fitWidget(const QSize &size); // Calculate the complete transformation for the skin // (base class implementation provides rotation). - virtual QMatrix skinTransform() const; + virtual QTransform skinTransform() const; private: const QSize m_screenSize; @@ -286,9 +286,9 @@ void PreviewDeviceSkin::fitWidget(const QSize &size) view()->setFixedSize(size); } -QMatrix PreviewDeviceSkin::skinTransform() const +QTransform PreviewDeviceSkin::skinTransform() const { - QMatrix newTransform; + QTransform newTransform; switch (m_direction) { case DirectionUp: break; @@ -342,7 +342,7 @@ signals: protected: void populateContextMenu(QMenu *m) override; - QMatrix skinTransform() const override; + QTransform skinTransform() const override; void fitWidget(const QSize &size) override; private: @@ -415,10 +415,10 @@ void ZoomablePreviewDeviceSkin::populateContextMenu(QMenu *menu) menu->addSeparator(); } -QMatrix ZoomablePreviewDeviceSkin::skinTransform() const +QTransform ZoomablePreviewDeviceSkin::skinTransform() const { // Complete transformation consisting of base class rotation and zoom. - QMatrix rc = PreviewDeviceSkin::skinTransform(); + QTransform rc = PreviewDeviceSkin::skinTransform(); const int zp = zoomPercent(); if (zp != 100) { const qreal factor = zoomFactor(zp); diff --git a/src/designer/src/lib/shared/promotionmodel.cpp b/src/designer/src/lib/shared/promotionmodel.cpp index 37136ced6..ec7ac25d9 100644 --- a/src/designer/src/lib/shared/promotionmodel.cpp +++ b/src/designer/src/lib/shared/promotionmodel.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE namespace { - using StandardItemList = QList<QStandardItem *>; + using StandardItemList = QVector<QStandardItem *>; // Model columns. enum { ClassNameColumn, IncludeFileColumn, IncludeTypeColumn, ReferencedColumn, NumColumns }; diff --git a/src/designer/src/lib/shared/promotiontaskmenu_p.h b/src/designer/src/lib/shared/promotiontaskmenu_p.h index 641efa9b3..3f02ed380 100644 --- a/src/designer/src/lib/shared/promotiontaskmenu_p.h +++ b/src/designer/src/lib/shared/promotiontaskmenu_p.h @@ -83,7 +83,7 @@ public: // Defaults to "Demote to %1".arg(class). void setDemoteLabel(const QString &demoteLabel); - using ActionList = QList<QAction *>; + using ActionList = QVector<QAction *>; enum AddFlags { LeadingSeparator = 1, TrailingSeparator = 2, SuppressGlobalEdit = 4}; @@ -120,7 +120,7 @@ private: QPointer<QWidget> m_widget; // Per-Widget actions - QList<QAction *> m_promotionActions; + QVector<QAction *> m_promotionActions; QAction *m_globalEditAction; QAction *m_EditPromoteToAction; diff --git a/src/designer/src/lib/shared/qdesigner_dnditem_p.h b/src/designer/src/lib/shared/qdesigner_dnditem_p.h index 36419389b..26aa62c4a 100644 --- a/src/designer/src/lib/shared/qdesigner_dnditem_p.h +++ b/src/designer/src/lib/shared/qdesigner_dnditem_p.h @@ -91,7 +91,7 @@ class QDESIGNER_SHARED_EXPORT QDesignerMimeData : public QMimeData { Q_OBJECT public: - using QDesignerDnDItems = QList<QDesignerDnDItemInterface *>; + using QDesignerDnDItems = QVector<QDesignerDnDItemInterface *>; ~QDesignerMimeData() override; diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp index 3b25125af..4c8282ca1 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp +++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp @@ -224,7 +224,7 @@ static bool readDomEnumerationValue(const DomProperty *p, return false; } -void QDesignerFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &properties) +void QDesignerFormBuilder::applyProperties(QObject *o, const QVector<DomProperty*> &properties) { if (properties.isEmpty()) return; diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h index ceaf1b395..da1f75eb7 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h +++ b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h @@ -111,7 +111,7 @@ protected: virtual QIcon nameToIcon(const QString &filePath, const QString &qrcPath); virtual QPixmap nameToPixmap(const QString &filePath, const QString &qrcPath); - void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; + void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; diff --git a/src/designer/src/lib/shared/qdesigner_introspection.cpp b/src/designer/src/lib/shared/qdesigner_introspection.cpp index 344fed976..099dadc9c 100644 --- a/src/designer/src/lib/shared/qdesigner_introspection.cpp +++ b/src/designer/src/lib/shared/qdesigner_introspection.cpp @@ -99,7 +99,7 @@ namespace { Kind kind() const override { return m_kind; } AccessFlags accessFlags() const override { return m_access; } - Attributes attributes(const QObject *object = nullptr) const override; + Attributes attributes() const override; QVariant::Type type() const override { return m_property.type(); } QString name() const override { return m_name; } @@ -162,20 +162,9 @@ namespace { delete m_enumerator; } - QDesignerMetaProperty::Attributes QDesignerMetaProperty::attributes(const QObject *object) const + QDesignerMetaProperty::Attributes QDesignerMetaProperty::attributes() const { - if (!object) - return m_defaultAttributes; - Attributes rc; - if (m_property.isDesignable(object)) - rc |= DesignableAttribute; - if (m_property.isScriptable(object)) - rc |= ScriptableAttribute; - if (m_property.isStored(object)) - rc |= StoredAttribute; - if (m_property.isUser(object)) - rc |= UserAttribute; - return rc; + return m_defaultAttributes; } // -------------- QDesignerMetaMethod diff --git a/src/designer/src/lib/shared/qdesigner_membersheet.cpp b/src/designer/src/lib/shared/qdesigner_membersheet.cpp index 2e62aab7f..f0295601a 100644 --- a/src/designer/src/lib/shared/qdesigner_membersheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_membersheet.cpp @@ -34,14 +34,11 @@ #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE -static QList<QByteArray> stringListToByteArray(const QStringList &l) -{ - if (l.isEmpty()) - return QList<QByteArray>(); - QList<QByteArray> rc; - const QStringList::const_iterator cend = l.constEnd(); - for (QStringList::const_iterator it = l.constBegin(); it != cend; ++it) - rc += it->toUtf8(); +static QVector<QByteArray> stringListToByteArray(const QStringList &l) +{ + QVector<QByteArray> rc; + for (const QString &s : l) + rc.append(s.toUtf8()); return rc; } @@ -187,12 +184,12 @@ bool QDesignerMemberSheet::inheritedFromWidget(int index) const } -QList<QByteArray> QDesignerMemberSheet::parameterTypes(int index) const +QVector<QByteArray> QDesignerMemberSheet::parameterTypes(int index) const { return stringListToByteArray(d->m_meta->method(index)->parameterTypes()); } -QList<QByteArray> QDesignerMemberSheet::parameterNames(int index) const +QVector<QByteArray> QDesignerMemberSheet::parameterNames(int index) const { return stringListToByteArray(d->m_meta->method(index)->parameterNames()); } diff --git a/src/designer/src/lib/shared/qdesigner_membersheet_p.h b/src/designer/src/lib/shared/qdesigner_membersheet_p.h index b67ad3792..eac3d6383 100644 --- a/src/designer/src/lib/shared/qdesigner_membersheet_p.h +++ b/src/designer/src/lib/shared/qdesigner_membersheet_p.h @@ -80,8 +80,8 @@ public: QString declaredInClass(int index) const override; QString signature(int index) const override; - QList<QByteArray> parameterTypes(int index) const override; - QList<QByteArray> parameterNames(int index) const override; + QVector<QByteArray> parameterTypes(int index) const override; + QVector<QByteArray> parameterNames(int index) const override; private: QDesignerMemberSheetPrivate *d; diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp index 287a2fc3c..84bc8e365 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar.cpp +++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp @@ -56,7 +56,7 @@ Q_DECLARE_METATYPE(QAction*) QT_BEGIN_NAMESPACE -using ActionList = QList<QAction *>; +using ActionList = QVector<QAction *>; using namespace qdesigner_internal; diff --git a/src/designer/src/lib/shared/qdesigner_menubar_p.h b/src/designer/src/lib/shared/qdesigner_menubar_p.h index 5ec5132ab..bd86b809f 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar_p.h +++ b/src/designer/src/lib/shared/qdesigner_menubar_p.h @@ -90,7 +90,7 @@ public: void moveDown(); // Helpers for MenuTaskMenu/MenuBarTaskMenu extensions - QList<QAction *> contextMenuActions(); + QVector<QAction *> contextMenuActions(); void deleteMenuAction(QAction *action); private slots: diff --git a/src/designer/src/lib/shared/qdesigner_promotion.cpp b/src/designer/src/lib/shared/qdesigner_promotion.cpp index 08b2848fd..448fab314 100644 --- a/src/designer/src/lib/shared/qdesigner_promotion.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotion.cpp @@ -164,7 +164,7 @@ namespace qdesigner_internal { return true; } - QList<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotion::promotionBaseClasses() const + QVector<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotion::promotionBaseClasses() const { using SortedDatabaseItemMap = QMap<QString, QDesignerWidgetDataBaseItemInterface *>; SortedDatabaseItemMap sortedDatabaseItemMap; diff --git a/src/designer/src/lib/shared/qdesigner_promotion_p.h b/src/designer/src/lib/shared/qdesigner_promotion_p.h index 3448fd999..c88e7130c 100644 --- a/src/designer/src/lib/shared/qdesigner_promotion_p.h +++ b/src/designer/src/lib/shared/qdesigner_promotion_p.h @@ -70,7 +70,7 @@ namespace qdesigner_internal { bool setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage) override; - QList<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const override; + QVector<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const override; private: bool canBePromoted(const QDesignerWidgetDataBaseItemInterface *) const; diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp index 1ec5cd9ae..e2dd81509 100644 --- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp @@ -288,7 +288,7 @@ namespace qdesigner_internal { } const QStringList &QDesignerPromotionDialog::baseClassNames(const QDesignerPromotionInterface *promotion) { - using WidgetDataBaseItemList = QList<QDesignerWidgetDataBaseItemInterface *>; + using WidgetDataBaseItemList = QVector<QDesignerWidgetDataBaseItemInterface *>; static QStringList rc; if (rc.isEmpty()) { // Convert the item list into a string list. diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h index 2ee57ad2c..ab7662f2a 100644 --- a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h +++ b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h @@ -148,7 +148,7 @@ public: protected: using PropertyHelperPtr = QSharedPointer<PropertyHelper>; - using PropertyHelperList = QList<PropertyHelperPtr>; + using PropertyHelperList = QVector<PropertyHelperPtr>; // add an object bool add(QObject *object, const QString &propertyName); @@ -259,14 +259,14 @@ class QDESIGNER_SHARED_EXPORT AddDynamicPropertyCommand: public QDesignerFormWin public: explicit AddDynamicPropertyCommand(QDesignerFormWindowInterface *formWindow); - bool init(const QList<QObject *> &selection, QObject *current, const QString &propertyName, const QVariant &value); + bool init(const QVector<QObject *> &selection, QObject *current, const QString &propertyName, const QVariant &value); virtual void redo(); virtual void undo(); private: void setDescription(); QString m_propertyName; - QList<QObject *> m_selection; + QVector<QObject *> m_selection; QVariant m_value; }; @@ -276,7 +276,7 @@ class QDESIGNER_SHARED_EXPORT RemoveDynamicPropertyCommand: public QDesignerForm public: explicit RemoveDynamicPropertyCommand(QDesignerFormWindowInterface *formWindow); - bool init(const QList<QObject *> &selection, QObject *current, const QString &propertyName); + bool init(const QVector<QObject *> &selection, QObject *current, const QString &propertyName); virtual void redo(); virtual void undo(); diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp index c142ee7b1..cf0933757 100644 --- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp @@ -692,7 +692,7 @@ QDesignerPropertySheet::QDesignerPropertySheet(QObject *object, QObject *parent) createFakeProperty(QStringLiteral("floating")); } - using ByteArrayList = QList<QByteArray>; + using ByteArrayList = QVector<QByteArray>; const ByteArrayList names = object->dynamicPropertyNames(); if (!names.isEmpty()) { const ByteArrayList::const_iterator cend = names.constEnd(); @@ -1458,23 +1458,13 @@ bool QDesignerPropertySheet::isFakeLayoutProperty(int index) const return false; } -// Determine the "designable" state of a property. Properties, which have -// a per-object boolean test function that returns false are shown in -// disabled state ("checked" depending on "checkable", etc.) -// Properties, which are generally not designable independent -// of the object are not shown at all. -enum DesignableState { PropertyIsDesignable, - // Object has a Designable test function that returns false. - PropertyOfObjectNotDesignable, - PropertyNotDesignable }; - -static inline DesignableState designableState(const QDesignerMetaPropertyInterface *p, const QObject *object) -{ - if (p->attributes(object) & QDesignerMetaPropertyInterface::DesignableAttribute) - return PropertyIsDesignable; - return (p->attributes() & QDesignerMetaPropertyInterface::DesignableAttribute) ? - PropertyOfObjectNotDesignable : PropertyNotDesignable; -} +// Visible vs. Enabled: In Qt 5, it was possible to define a boolean function +// for the DESIGNABLE attribute of Q_PROPERTY. Qt Designer would use that to +// determine isEnabled() for the property and return isVisible() = false +// for properties that specified 'false' for DESIGNABLE. +// This was used for example for the "checked" property of QAbstractButton, +// QGroupBox and QAction, where "checkable" would determine isEnabled(). +// This is now implemented by querying the property directly. bool QDesignerPropertySheet::isVisible(int index) const { @@ -1550,8 +1540,7 @@ bool QDesignerPropertySheet::isVisible(int index) const if (!(p->accessFlags() & QDesignerMetaPropertyInterface::WriteAccess)) return false; - // Enabled handling: Hide only statically not designable properties - return designableState(p, d->m_object) != PropertyNotDesignable; + return p->attributes().testFlag(QDesignerMetaPropertyInterface::DesignableAttribute); } void QDesignerPropertySheet::setVisible(int index, bool visible) @@ -1588,7 +1577,7 @@ bool QDesignerPropertySheet::isEnabled(int index) const if (!p->accessFlags().testFlag(QDesignerMetaPropertyInterface::WriteAccess)) return false; - if (designableState(p, d->m_object) == PropertyOfObjectNotDesignable) + if (!p->attributes().testFlag(QDesignerMetaPropertyInterface::DesignableAttribute)) return false; const PropertyType type = propertyType(index); diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp index 3168eae73..f2a399752 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp +++ b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp @@ -464,14 +464,14 @@ void QDesignerTaskMenu::removeStatusBar() } } -QList<QAction*> QDesignerTaskMenu::taskActions() const +QVector<QAction*> QDesignerTaskMenu::taskActions() const { QDesignerFormWindowInterface *formWindow = QDesignerFormWindowInterface::findFormWindow(widget()); Q_ASSERT(formWindow); const bool isMainContainer = formWindow->mainContainer() == widget(); - QList<QAction*> actions; + QVector<QAction*> actions; if (const QMainWindow *mw = qobject_cast<const QMainWindow*>(formWindow->mainContainer())) { if (isMainContainer || mw->centralWidget() == widget()) { diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h index b4bc23da4..99d64a5ef 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h +++ b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h @@ -68,7 +68,7 @@ public: QWidget *widget() const; - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; enum PropertyMode { CurrentWidgetMode, MultiSelectionMode }; diff --git a/src/designer/src/lib/shared/qdesigner_toolbar.cpp b/src/designer/src/lib/shared/qdesigner_toolbar.cpp index 08723c2ff..83637eedc 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar.cpp +++ b/src/designer/src/lib/shared/qdesigner_toolbar.cpp @@ -55,7 +55,7 @@ Q_DECLARE_METATYPE(QAction*) QT_BEGIN_NAMESPACE -using ActionList = QList<QAction *>; +using ActionList = QVector<QAction *>; namespace qdesigner_internal { // ------------------- ToolBarEventFilter diff --git a/src/designer/src/lib/shared/qdesigner_toolbar_p.h b/src/designer/src/lib/shared/qdesigner_toolbar_p.h index 97d957c0c..c9fef9fec 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar_p.h +++ b/src/designer/src/lib/shared/qdesigner_toolbar_p.h @@ -85,7 +85,7 @@ public: bool eventFilter (QObject *watched, QEvent *event) override; // Helper for task menu extension - QList<QAction *> contextMenuActions(const QPoint &globalPos = QPoint(-1, -1)); + QVector<QAction *> contextMenuActions(const QPoint &globalPos = QPoint(-1, -1)); static ToolBarEventFilter *eventFilterOf(const QToolBar *tb); diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp index d87874105..647104cd9 100644 --- a/src/designer/src/lib/shared/qlayout_widget.cpp +++ b/src/designer/src/lib/shared/qlayout_widget.cpp @@ -608,7 +608,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const // Figure out states of a cell and return as a flat vector of // [column1, column2,...] (address as row * columnCount + col) - static CellStates cellStates(const QList<QRect> &rects, int numRows, int numColumns); + static CellStates cellStates(const QVector<QRect> &rects, int numRows, int numColumns); typedef QMap<QWidget *, QRect> WidgetItemMap; typedef QMap<QWidget *, Qt::Alignment> WidgetAlignmentMap; @@ -635,7 +635,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const return str; } - GridLayoutState::CellStates GridLayoutState::cellStates(const QList<QRect> &rects, int numRows, int numColumns) + GridLayoutState::CellStates GridLayoutState::cellStates(const QVector<QRect> &rects, int numRows, int numColumns) { CellStates rc = CellStates(numRows * numColumns, CellState(Free, Free)); for (const auto &rect : rects) { @@ -1915,11 +1915,11 @@ void QLayoutWidget::paintEvent(QPaintEvent*) columns[column + i - 2] = true; while (rowSpan > 0) { - excludedColumnsForRow[row + rowSpan - 1].unite(columns); + excludedColumnsForRow[row + rowSpan - 1].insert(columns); rowSpan--; } while (columnSpan > 0) { - excludedRowsForColumn[column + columnSpan - 1].unite(rows); + excludedRowsForColumn[column + columnSpan - 1].insert(rows); columnSpan--; } } diff --git a/src/designer/src/lib/shared/qsimpleresource_p.h b/src/designer/src/lib/shared/qsimpleresource_p.h index e2dccaa53..ad8dfb989 100644 --- a/src/designer/src/lib/shared/qsimpleresource_p.h +++ b/src/designer/src/lib/shared/qsimpleresource_p.h @@ -101,7 +101,7 @@ private: // Contents of clipboard for formbuilder copy and paste operations // (Actions and widgets) struct QDESIGNER_SHARED_EXPORT FormBuilderClipboard { - using ActionList = QList<QAction *>; + using ActionList = QVector<QAction *>; FormBuilderClipboard() = default; FormBuilderClipboard(QWidget *w); diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp index a1c15e708..5c7d27f32 100644 --- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp +++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp @@ -82,7 +82,7 @@ struct QtResourceFileData { struct QtResourcePrefixData { QString prefix; QString language; - QList<QtResourceFileData> resourceFileList; + QVector<QtResourceFileData> resourceFileList; bool operator==(const QtResourcePrefixData &other) const { return prefix == other.prefix && language == other.language @@ -92,7 +92,7 @@ struct QtResourcePrefixData { struct QtQrcFileData { QString qrcPath; - QList<QtResourcePrefixData> resourceList; + QVector<QtResourcePrefixData> resourceList; bool operator==(const QtQrcFileData &other) const { return qrcPath == other.qrcPath && resourceList == other.resourceList; } }; @@ -230,13 +230,13 @@ public: QString prefix() const { return m_prefix; } QString language() const { return m_language; } - QList<QtResourceFile *> resourceFiles() const { return m_resourceFiles; } + QVector<QtResourceFile *> resourceFiles() const { return m_resourceFiles; } private: QtResourcePrefix() = default; QString m_prefix; QString m_language; - QList<QtResourceFile *> m_resourceFiles; + QVector<QtResourceFile *> m_resourceFiles; }; // ------------------- QtQrcFile @@ -246,7 +246,7 @@ public: QString path() const { return m_path; } QString fileName() const { return m_fileName; } - QList<QtResourcePrefix *> resourcePrefixList() const { return m_resourcePrefixes; } + QVector<QtResourcePrefix *> resourcePrefixList() const { return m_resourcePrefixes; } QtQrcFileData initialState() const { return m_initialState; } private: @@ -260,7 +260,7 @@ private: QString m_path; QString m_fileName; - QList<QtResourcePrefix *> m_resourcePrefixes; + QVector<QtResourcePrefix *> m_resourcePrefixes; QtQrcFileData m_initialState; }; @@ -272,7 +272,7 @@ public: QtQrcManager(QObject *parent = nullptr); ~QtQrcManager() override; - QList<QtQrcFile *> qrcFiles() const; + QVector<QtQrcFile *> qrcFiles() const; // helpers QtQrcFile *qrcFileOf(const QString &path) const; @@ -332,12 +332,12 @@ signals: void resourceFileRemoved(QtResourceFile *resourceFile); private: - QList<QtQrcFile *> m_qrcFiles; + QVector<QtQrcFile *> m_qrcFiles; QMap<QString, QtQrcFile *> m_pathToQrc; QMap<QtQrcFile *, bool> m_qrcFileToExists; QMap<QtResourcePrefix *, QtQrcFile *> m_prefixToQrc; QMap<QtResourceFile *, QtResourcePrefix *> m_fileToPrefix; - QMap<QString, QList<QtResourceFile *> > m_fullPathToResourceFiles; + QMap<QString, QVector<QtResourceFile *> > m_fullPathToResourceFiles; QMap<QString, QIcon> m_fullPathToIcon; QMap<QString, bool> m_fullPathToExists; }; @@ -353,7 +353,7 @@ QtQrcManager::~QtQrcManager() clear(); } -QList<QtQrcFile *> QtQrcManager::qrcFiles() const +QVector<QtQrcFile *> QtQrcManager::qrcFiles() const { return m_qrcFiles; } @@ -397,11 +397,11 @@ void QtQrcManager::exportQrcFile(QtQrcFile *qrcFile, QtQrcFileData *qrcFileData) QtQrcFileData &data = *qrcFileData; - QList<QtResourcePrefixData> resourceList; + QVector<QtResourcePrefixData> resourceList; const auto resourcePrefixes = qrcFile->resourcePrefixList(); for (const QtResourcePrefix *prefix : resourcePrefixes) { - QList<QtResourceFileData> resourceFileList; + QVector<QtResourceFileData> resourceFileList; const auto resourceFiles = prefix->resourceFiles(); for (QtResourceFile *file : resourceFiles) { QtResourceFileData fileData; @@ -857,7 +857,7 @@ public: QtResourceModel *m_resourceModel = nullptr; QDesignerDialogGuiInterface *m_dlgGui = nullptr; QtQrcManager *m_qrcManager = nullptr; - QList<QtQrcFileData> m_initialState; + QVector<QtQrcFileData> m_initialState; QMap<QtQrcFile *, QListWidgetItem *> m_qrcFileToItem; QMap<QListWidgetItem *, QtQrcFile *> m_itemToQrcFile; @@ -983,7 +983,7 @@ QStandardItem *QtResourceEditorDialogPrivate::insertResourcePrefix(QtResourcePre QStandardItem *prefixItem = new QStandardItem(); QStandardItem *languageItem = new QStandardItem(); - QList<QStandardItem *> items; + QVector<QStandardItem *> items; items << prefixItem; items << languageItem; m_treeModel->insertRow(row, items); @@ -1087,7 +1087,7 @@ void QtResourceEditorDialogPrivate::slotResourceFileInserted(QtResourceFile *res QStandardItem *pathItem = new QStandardItem(resourceFile->path()); QStandardItem *aliasItem = new QStandardItem(); QStandardItem *parentItem = m_resourcePrefixToPrefixItem.value(resourcePrefix); - QList<QStandardItem *> items; + QVector<QStandardItem *> items; items << pathItem; items << aliasItem; @@ -2094,7 +2094,7 @@ void QtResourceEditorDialog::displayResourceFailures(const QString &logOutput, Q void QtResourceEditorDialog::accept() { QStringList newQrcPaths; - QList<QtQrcFileData> currentState; + QVector<QtQrcFileData> currentState; const auto qrcFiles = d_ptr->m_qrcManager->qrcFiles(); for (QtQrcFile *qrcFile : qrcFiles) { diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp index fec22a015..f853e13c2 100644 --- a/src/designer/src/lib/shared/qtresourcemodel.cpp +++ b/src/designer/src/lib/shared/qtresourcemodel.cpp @@ -79,7 +79,7 @@ public: // then later when that resource set is activated it needs to be reregistered) QMap<QtResourceSet *, bool> m_newlyCreated; // all created but not activated yet // (if was active at some point and it's not now it will not be on that map) - QMap<QString, QList<QtResourceSet *> > m_pathToResourceSet; + QMap<QString, QVector<QtResourceSet *> > m_pathToResourceSet; QtResourceSet *m_currentResourceSet = nullptr; typedef QMap<QString, const QByteArray *> PathDataMap; @@ -487,7 +487,7 @@ void QtResourceModel::setModified(const QString &path) d_ptr->m_resourceSetToReload.insert(rs, true); } -QList<QtResourceSet *> QtResourceModel::resourceSets() const +QVector<QtResourceSet *> QtResourceModel::resourceSets() const { return d_ptr->m_resourceSetToPaths.keys(); } diff --git a/src/designer/src/lib/shared/qtresourcemodel_p.h b/src/designer/src/lib/shared/qtresourcemodel_p.h index 65d615f52..e6da05351 100644 --- a/src/designer/src/lib/shared/qtresourcemodel_p.h +++ b/src/designer/src/lib/shared/qtresourcemodel_p.h @@ -91,7 +91,7 @@ public: bool isModified(const QString &path) const; // only for paths which are on loadedQrcFiles() list void setModified(const QString &path); // only for paths which are on loadedQrcPaths() list - QList<QtResourceSet *> resourceSets() const; + QVector<QtResourceSet *> resourceSets() const; QtResourceSet *currentResourceSet() const; void setCurrentResourceSet(QtResourceSet *resourceSet, int *errorCount = nullptr, QString *errorMessages = nullptr); diff --git a/src/designer/src/lib/shared/rcc.cpp b/src/designer/src/lib/shared/rcc.cpp index e75b68f0a..050c6f418 100644 --- a/src/designer/src/lib/shared/rcc.cpp +++ b/src/designer/src/lib/shared/rcc.cpp @@ -589,7 +589,7 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file) parent->m_children.insert(node, s); parent = s; } else { - parent = parent->m_children[node]; + parent = *parent->m_children.constFind(node); } } @@ -602,7 +602,7 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file) qPrintable(fileName), qPrintable(filename)); } } - parent->m_children.insertMulti(filename, s); + parent->m_children.insert(filename, s); return true; } diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp index 6b63ac7b4..bb1590af4 100644 --- a/src/designer/src/lib/shared/widgetdatabase.cpp +++ b/src/designer/src/lib/shared/widgetdatabase.cpp @@ -188,12 +188,12 @@ void WidgetDataBaseItem::setExtends(const QString &s) m_extends = s; } -void WidgetDataBaseItem::setDefaultPropertyValues(const QList<QVariant> &list) +void WidgetDataBaseItem::setDefaultPropertyValues(const QVector<QVariant> &list) { m_defaultPropertyValues = list; } -QList<QVariant> WidgetDataBaseItem::defaultPropertyValues() const +QVector<QVariant> WidgetDataBaseItem::defaultPropertyValues() const { return m_defaultPropertyValues; } @@ -348,7 +348,7 @@ static WidgetDataBaseItem *createCustomWidgetItem(const QDesignerCustomWidgetInt void WidgetDataBase::loadPlugins() { typedef QMap<QString, int> NameIndexMap; - using ItemList = QList<QDesignerWidgetDataBaseItemInterface *>; + using ItemList = QVector<QDesignerWidgetDataBaseItemInterface *>; using NameSet = QSet<QString>; // 1) create a map of existing custom classes NameIndexMap existingCustomClasses; @@ -417,7 +417,7 @@ void WidgetDataBase::remove(int index) delete m_items.takeAt(index); } -QList<QVariant> WidgetDataBase::defaultPropertyValues(const QString &name) +QVector<QVariant> WidgetDataBase::defaultPropertyValues(const QString &name) { WidgetFactory *factory = qobject_cast<WidgetFactory *>(m_core->widgetFactory()); Q_ASSERT(factory); @@ -537,7 +537,7 @@ QStringList WidgetDataBase::customFormWidgetClasses(const QDesignerFormEditorInt // properties to be suitable for new forms static QString xmlFromWidgetBox(const QDesignerFormEditorInterface *core, const QString &className, const QString &objectName) { - using PropertyList = QList<DomProperty *>; + using PropertyList = QVector<DomProperty *>; QDesignerWidgetBoxInterface::Widget widget; const bool found = QDesignerWidgetBox::findWidget(core->widgetBox(), className, QString(), &widget); diff --git a/src/designer/src/lib/shared/widgetdatabase_p.h b/src/designer/src/lib/shared/widgetdatabase_p.h index 73f00b6b6..8a591ec6a 100644 --- a/src/designer/src/lib/shared/widgetdatabase_p.h +++ b/src/designer/src/lib/shared/widgetdatabase_p.h @@ -101,8 +101,8 @@ public: QString extends() const override; void setExtends(const QString &s) override; - void setDefaultPropertyValues(const QList<QVariant> &list) override; - QList<QVariant> defaultPropertyValues() const override; + void setDefaultPropertyValues(const QVector<QVariant> &list) override; + QVector<QVariant> defaultPropertyValues() const override; static WidgetDataBaseItem *clone(const QDesignerWidgetDataBaseItemInterface *item); @@ -129,7 +129,7 @@ private: uint m_container: 1; uint m_custom: 1; uint m_promoted: 1; - QList<QVariant> m_defaultPropertyValues; + QVector<QVariant> m_defaultPropertyValues; QStringList m_fakeSlots; QStringList m_fakeSignals; }; @@ -170,7 +170,7 @@ public slots: void loadPlugins(); private: - QList<QVariant> defaultPropertyValues(const QString &name); + QVector<QVariant> defaultPropertyValues(const QString &name); QDesignerFormEditorInterface *m_core; }; @@ -184,7 +184,7 @@ QDESIGNER_SHARED_EXPORT QDesignerWidgetDataBaseItemInterface bool promoted, bool custom); -using WidgetDataBaseItemList = QList<QDesignerWidgetDataBaseItemInterface *>; +using WidgetDataBaseItemList = QVector<QDesignerWidgetDataBaseItemInterface *>; QDESIGNER_SHARED_EXPORT WidgetDataBaseItemList promotionCandidates(const QDesignerWidgetDataBaseInterface *db, diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp index c8db16f97..026fe1817 100644 --- a/src/designer/src/lib/shared/widgetfactory.cpp +++ b/src/designer/src/lib/shared/widgetfactory.cpp @@ -71,6 +71,10 @@ #include <QtCore/qmetaobject.h> #include <QtCore/qpointer.h> +#ifdef QT_OPENGLWIDGETS_LIB +# include <QtOpenGLWidgets/qopenglwidget.h> +#endif + QT_BEGIN_NAMESPACE #ifdef Q_OS_WIN diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp index 7a7ca2afc..9670958ce 100644 --- a/src/designer/src/lib/shared/zoomwidget.cpp +++ b/src/designer/src/lib/shared/zoomwidget.cpp @@ -516,7 +516,7 @@ void ZoomWidget::dump() const { qDebug() << "ZoomWidget::dump " << geometry() << " Viewport " << viewport()->geometry() - << "Scroll: " << scrollPosition() << "Matrix: " << matrix() << " SceneRect: " << sceneRect(); + << "Scroll: " << scrollPosition() << "Transform: " << transform() << " SceneRect: " << sceneRect(); if (m_proxy) { qDebug() << "Proxy Pos: " << m_proxy->pos() << "Proxy " << m_proxy->size() << "\nProxy size hint" diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp index 4d39cdb5d..e9a94c521 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -918,7 +907,7 @@ QLayoutItem *QAbstractFormBuilder::create(DomLayoutItem *ui_layoutItem, QLayout /*! \internal */ -void QAbstractFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &properties) +void QAbstractFormBuilder::applyProperties(QObject *o, const QVector<DomProperty*> &properties) { for (DomProperty *p : properties) { const QVariant v = toVariant(o->metaObject(), p); @@ -1266,9 +1255,9 @@ void FormBuilderSaveLayoutEntry::setAlignment(Qt::Alignment al) } // Create list from standard box layout -static QList<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout) +static QVector<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout) { - QList<FormBuilderSaveLayoutEntry> rc; + QVector<FormBuilderSaveLayoutEntry> rc; if (const int count = layout->count()) { rc.reserve(count); for (int idx = 0; idx < count; ++idx) { @@ -1282,9 +1271,9 @@ static QList<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout } // Create list from grid layout -static QList<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *gridLayout) +static QVector<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *gridLayout) { - QList<FormBuilderSaveLayoutEntry> rc; + QVector<FormBuilderSaveLayoutEntry> rc; if (const int count = gridLayout->count()) { rc.reserve(count); for (int idx = 0; idx < count; ++idx) { @@ -1300,9 +1289,9 @@ static QList<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *grid #if QT_CONFIG(formlayout) // Create list from form layout -static QList<FormBuilderSaveLayoutEntry> saveFormLayoutEntries(const QFormLayout *formLayout) +static QVector<FormBuilderSaveLayoutEntry> saveFormLayoutEntries(const QFormLayout *formLayout) { - QList<FormBuilderSaveLayoutEntry> rc; + QVector<FormBuilderSaveLayoutEntry> rc; if (const int count = formLayout->count()) { rc.reserve(count); for (int idx = 0; idx < count; ++idx) { @@ -1343,7 +1332,7 @@ DomLayout *QAbstractFormBuilder::createDom(QLayout *layout, DomLayout *ui_layout lay->setAttributeName(objectName); lay->setElementProperty(computeProperties(layout)); - QList<FormBuilderSaveLayoutEntry> newList; + QVector<FormBuilderSaveLayoutEntry> newList; if (QGridLayout *gridLayout = qobject_cast<QGridLayout *>(layout)) { newList = saveGridLayoutEntries(gridLayout); #if QT_CONFIG(formlayout) @@ -1405,7 +1394,7 @@ DomSpacer *QAbstractFormBuilder::createDom(QSpacerItem *spacer, DomLayout *ui_la Q_UNUSED(ui_parentWidget); DomSpacer *ui_spacer = new DomSpacer(); - QList<DomProperty*> properties; + QVector<DomProperty*> properties; DomProperty *prop = nullptr; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); @@ -1441,9 +1430,9 @@ DomProperty *QAbstractFormBuilder::createProperty(QObject *obj, const QString &p /*! \internal */ -QList<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj) +QVector<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj) { - QList<DomProperty*> lst; + QVector<DomProperty*> lst; const QMetaObject *meta = obj->metaObject(); @@ -1505,7 +1494,7 @@ QList<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj) /*! \internal */ -QAbstractFormBuilder::DomPropertyHash QAbstractFormBuilder::propertyMap(const QList<DomProperty*> &properties) +QAbstractFormBuilder::DomPropertyHash QAbstractFormBuilder::propertyMap(const QVector<DomProperty*> &properties) { DomPropertyHash map; @@ -1618,7 +1607,7 @@ public: }; template<class T> -static void storeItemFlags(const T *item, QList<DomProperty*> *properties) +static void storeItemFlags(const T *item, QVector<DomProperty*> *properties) { static const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); static const Qt::ItemFlags defaultFlags = T().flags(); @@ -1634,7 +1623,7 @@ static void storeItemFlags(const T *item, QList<DomProperty*> *properties) template<class T> static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const T *item, - QList<DomProperty*> *properties) + QVector<DomProperty*> *properties) { static const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); FriendlyFB * const formBuilder = static_cast<FriendlyFB *>(abstractFormBuilder); @@ -1659,7 +1648,7 @@ static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const T *i template<class T> static void storeItemPropsNFlags(QAbstractFormBuilder *abstractFormBuilder, const T *item, - QList<DomProperty*> *properties) + QVector<DomProperty*> *properties) { storeItemProps<T>(abstractFormBuilder, item, properties); storeItemFlags<T>(item, properties); @@ -1725,7 +1714,7 @@ void QAbstractFormBuilder::saveTreeWidgetExtraInfo(QTreeWidget *treeWidget, DomW for (int c = 0; c<treeWidget->columnCount(); ++c) { DomColumn *column = new DomColumn; - QList<DomProperty*> properties; + QVector<DomProperty*> properties; for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles) { p = saveText(it.second, treeWidget->headerItem()->data(c, it.first.second)); @@ -1769,7 +1758,7 @@ void QAbstractFormBuilder::saveTreeWidgetExtraInfo(QTreeWidget *treeWidget, DomW DomItem *currentDomItem = new DomItem; - QList<DomProperty*> properties; + QVector<DomProperty*> properties; for (int c = 0; c < treeWidget->columnCount(); c++) { for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles) if ((p = saveText(it.second, item->data(c, it.first.second)))) @@ -1810,7 +1799,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D // save the horizontal header QVector<DomColumn *> columns; for (int c = 0; c < tableWidget->columnCount(); c++) { - QList<DomProperty*> properties; + QVector<DomProperty*> properties; QTableWidgetItem *item = tableWidget->horizontalHeaderItem(c); if (item) storeItemProps(this, item, &properties); @@ -1824,7 +1813,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D // save the vertical header QVector<DomRow *> rows; for (int r = 0; r < tableWidget->rowCount(); r++) { - QList<DomProperty*> properties; + QVector<DomProperty*> properties; QTableWidgetItem *item = tableWidget->verticalHeaderItem(r); if (item) storeItemProps(this, item, &properties); @@ -1840,7 +1829,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D for (int c = 0; c < tableWidget->columnCount(); c++) { QTableWidgetItem *item = tableWidget->item(r, c); if (item) { - QList<DomProperty*> properties; + QVector<DomProperty*> properties; storeItemPropsNFlags(this, item, &properties); DomItem *domItem = new DomItem; @@ -1863,7 +1852,7 @@ void QAbstractFormBuilder::saveListWidgetExtraInfo(QListWidget *listWidget, DomW auto ui_items = ui_widget->elementItem(); for (int i=0; i<listWidget->count(); ++i) { - QList<DomProperty*> properties; + QVector<DomProperty*> properties; storeItemPropsNFlags(this, listWidget->item(i), &properties); DomItem *ui_item = new DomItem(); @@ -1890,7 +1879,7 @@ void QAbstractFormBuilder::saveComboBoxExtraInfo(QComboBox *comboBox, DomWidget comboBox->itemData(i, Qt::DisplayPropertyRole)); DomProperty *iconProperty = saveResource(comboBox->itemData(i, Qt::DecorationPropertyRole)); if (textProperty || iconProperty) { - QList<DomProperty*> properties; + QVector<DomProperty*> properties; if (textProperty) properties.push_back(textProperty); if (iconProperty) @@ -1912,7 +1901,7 @@ void QAbstractFormBuilder::saveComboBoxExtraInfo(QComboBox *comboBox, DomWidget void QAbstractFormBuilder::saveButtonExtraInfo(const QAbstractButton *widget, DomWidget *ui_widget, DomWidget *) { - using DomPropertyList = QList<DomProperty *>; + using DomPropertyList = QVector<DomProperty *>; if (const QButtonGroup *buttonGroup = widget->group()) { DomPropertyList attributes = ui_widget->elementAttribute(); DomString *domString = new DomString(); @@ -2326,7 +2315,7 @@ void QAbstractFormBuilder::loadItemViewExtraInfo(DomWidget *ui_widget, QAbstract if (QTreeView *treeView = qobject_cast<QTreeView*>(itemView)) { const auto &allAttributes = ui_widget->elementAttribute(); - QList<DomProperty *> headerProperties; + QVector<DomProperty *> headerProperties; for (const QString &realPropertyName : realPropertyNames) { const QString upperPropertyName = realPropertyName.at(0).toUpper() + realPropertyName.mid(1); @@ -2346,7 +2335,7 @@ void QAbstractFormBuilder::loadItemViewExtraInfo(DomWidget *ui_widget, QAbstract const auto &allAttributes = ui_widget->elementAttribute(); for (const QString &headerPrefix : headerPrefixes) { - QList<DomProperty*> headerProperties; + QVector<DomProperty*> headerProperties; for (const QString &realPropertyName : realPropertyNames) { const QString upperPropertyName = realPropertyName.at(0).toUpper() + realPropertyName.mid(1); diff --git a/src/designer/src/lib/uilib/abstractformbuilder.h b/src/designer/src/lib/uilib/abstractformbuilder.h index 0e23c7de6..58c9aef26 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.h +++ b/src/designer/src/lib/uilib/abstractformbuilder.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -146,7 +135,7 @@ protected: virtual QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent); virtual void addMenuAction(QAction *action); - virtual void applyProperties(QObject *o, const QList<DomProperty*> &properties); + virtual void applyProperties(QObject *o, const QVector<DomProperty*> &properties); bool applyPropertyInternally(QObject *o, const QString &propertyName, const QVariant &value); virtual void applyTabStops(QWidget *widget, DomTabStops *tabStops); @@ -186,7 +175,7 @@ protected: virtual DomTabStops *saveTabStops(); virtual DomResources *saveResources(); DomButtonGroups *saveButtonGroups(const QWidget *mainContainer); - virtual QList<DomProperty*> computeProperties(QObject *obj); + virtual QVector<DomProperty*> computeProperties(QObject *obj); virtual bool checkProperty(QObject *obj, const QString &prop) const; virtual DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value); @@ -221,7 +210,7 @@ protected: static QString toString(const DomString *str); using DomPropertyHash = QHash<QString, DomProperty*>; - static DomPropertyHash propertyMap(const QList<DomProperty*> &properties); + static DomPropertyHash propertyMap(const QVector<DomProperty*> &properties); void setupColorGroup(QPalette &palette, QPalette::ColorGroup colorGroup, DomColorGroup *group); DomColorGroup *saveColorGroup(const QPalette &palette); diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp index 4230e27f7..590fe2b3a 100644 --- a/src/designer/src/lib/uilib/formbuilder.cpp +++ b/src/designer/src/lib/uilib/formbuilder.cpp @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -55,6 +44,10 @@ #include <QtUiPlugin/customwidget.h> #include <QtWidgets/QtWidgets> +#ifdef QT_OPENGLWIDGETS_LIB +# include <QtOpenGLWidgets/qopenglwidget.h> +#endif + QT_BEGIN_NAMESPACE #ifdef QFORMINTERNAL_NAMESPACE @@ -501,11 +494,11 @@ void QFormBuilder::updateCustomWidgets() } /*! - \fn QList<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const + \fn QVector<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const Returns a list of the available plugins. */ -QList<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const +QVector<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const { return d->m_customWidgets.values(); } @@ -514,7 +507,7 @@ QList<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const \internal */ -void QFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &properties) +void QFormBuilder::applyProperties(QObject *o, const QVector<DomProperty*> &properties) { if (properties.isEmpty()) diff --git a/src/designer/src/lib/uilib/formbuilder.h b/src/designer/src/lib/uilib/formbuilder.h index 522c6df78..b2a61bf9f 100644 --- a/src/designer/src/lib/uilib/formbuilder.h +++ b/src/designer/src/lib/uilib/formbuilder.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -80,7 +69,7 @@ public: void addPluginPath(const QString &pluginPath); void setPluginPath(const QStringList &pluginPaths); - QList<QDesignerCustomWidgetInterface*> customWidgets() const; + QVector<QDesignerCustomWidgetInterface*> customWidgets() const; protected: QWidget *create(DomUI *ui, QWidget *parentWidget) override; @@ -99,7 +88,7 @@ protected: bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; virtual void updateCustomWidgets(); - void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; + void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; static QWidget *widgetByName(QWidget *topLevel, const QString &name); diff --git a/src/designer/src/lib/uilib/formbuilderextra.cpp b/src/designer/src/lib/uilib/formbuilderextra.cpp index 8dfb1b479..f651faaff 100644 --- a/src/designer/src/lib/uilib/formbuilderextra.cpp +++ b/src/designer/src/lib/uilib/formbuilderextra.cpp @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/designer/src/lib/uilib/formbuilderextra_p.h b/src/designer/src/lib/uilib/formbuilderextra_p.h index b0239f6b1..f70fc7b56 100644 --- a/src/designer/src/lib/uilib/formbuilderextra_p.h +++ b/src/designer/src/lib/uilib/formbuilderextra_p.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -272,14 +261,14 @@ struct QDESIGNER_UILIB_EXPORT QFormBuilderStrings { const QString scriptChildWidgetsVariable; using RoleNName = QPair<Qt::ItemDataRole, QString>; - QList<RoleNName> itemRoles; + QVector<RoleNName> itemRoles; QHash<QString, Qt::ItemDataRole> treeItemRoleHash; // first.first is primary role, first.second is shadow role. // Shadow is used for either the translation source or the designer // representation of the string value. using TextRoleNName = QPair<QPair<Qt::ItemDataRole, Qt::ItemDataRole>, QString>; - QList<TextRoleNName> itemTextRoles; + QVector<TextRoleNName> itemTextRoles; QHash<QString, QPair<Qt::ItemDataRole, Qt::ItemDataRole> > treeItemTextRoleHash; }; #ifdef QFORMINTERNAL_NAMESPACE diff --git a/src/designer/src/lib/uilib/properties.cpp b/src/designer/src/lib/uilib/properties.cpp index 0e18d3ca9..36f4f7daa 100644 --- a/src/designer/src/lib/uilib/properties.cpp +++ b/src/designer/src/lib/uilib/properties.cpp @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/designer/src/lib/uilib/properties_p.h b/src/designer/src/lib/uilib/properties_p.h index aa707b323..7fa8e052f 100644 --- a/src/designer/src/lib/uilib/properties_p.h +++ b/src/designer/src/lib/uilib/properties_p.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/designer/src/lib/uilib/resourcebuilder.cpp b/src/designer/src/lib/uilib/resourcebuilder.cpp index f6bdaed5e..78960fce8 100644 --- a/src/designer/src/lib/uilib/resourcebuilder.cpp +++ b/src/designer/src/lib/uilib/resourcebuilder.cpp @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/designer/src/lib/uilib/resourcebuilder_p.h b/src/designer/src/lib/uilib/resourcebuilder_p.h index 89cb5f8fe..a5fb6b37c 100644 --- a/src/designer/src/lib/uilib/resourcebuilder_p.h +++ b/src/designer/src/lib/uilib/resourcebuilder_p.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/designer/src/lib/uilib/textbuilder.cpp b/src/designer/src/lib/uilib/textbuilder.cpp index abf148a93..96d453ee3 100644 --- a/src/designer/src/lib/uilib/textbuilder.cpp +++ b/src/designer/src/lib/uilib/textbuilder.cpp @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/designer/src/lib/uilib/textbuilder_p.h b/src/designer/src/lib/uilib/textbuilder_p.h index 3a2e75dd8..7944c6f7e 100644 --- a/src/designer/src/lib/uilib/textbuilder_p.h +++ b/src/designer/src/lib/uilib/textbuilder_p.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/designer/src/lib/uilib/ui4.cpp b/src/designer/src/lib/uilib/ui4.cpp index c58d3e80a..3ead7960a 100644 --- a/src/designer/src/lib/uilib/ui4.cpp +++ b/src/designer/src/lib/uilib/ui4.cpp @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/designer/src/lib/uilib/ui4_p.h b/src/designer/src/lib/uilib/ui4_p.h index 6066cf4d4..0b9a4c8e8 100644 --- a/src/designer/src/lib/uilib/ui4_p.h +++ b/src/designer/src/lib/uilib/ui4_p.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/designer/src/lib/uilib/uilib.pri b/src/designer/src/lib/uilib/uilib.pri index 386414b67..4d668eebe 100644 --- a/src/designer/src/lib/uilib/uilib.pri +++ b/src/designer/src/lib/uilib/uilib.pri @@ -4,8 +4,12 @@ INCLUDEPATH += $$PWD DEFINES += QT_DESIGNER QT_USE_QSTRINGBUILDER QT += widgets +qtHaveModule(openglwidgets): QT += openglwidgets QT_PRIVATE += uiplugin +qtConfig(opengl): \ + QT_PRIVATE += opengl + # Input HEADERS += \ $$PWD/ui4_p.h \ diff --git a/src/designer/src/lib/uilib/uilib_global.h b/src/designer/src/lib/uilib/uilib_global.h index 3f4944bc8..8630b0af0 100644 --- a/src/designer/src/lib/uilib/uilib_global.h +++ b/src/designer/src/lib/uilib/uilib_global.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Designer of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/designer/src/lib/uilib/widgets.table b/src/designer/src/lib/uilib/widgets.table index 3dbb7aff2..546197ebc 100644 --- a/src/designer/src/lib/uilib/widgets.table +++ b/src/designer/src/lib/uilib/widgets.table @@ -111,7 +111,7 @@ DECLARE_WIDGET(QWidget, "") #if QT_CONFIG(keysequenceedit) DECLARE_WIDGET(QKeySequenceEdit, "") #endif -#if QT_CONFIG(opengl) +#ifdef QT_OPENGLWIDGETS_LIB DECLARE_WIDGET(QOpenGLWidget, "") #endif #if QT_CONFIG(splitter) diff --git a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp index 299fb466c..989c47482 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp @@ -65,7 +65,7 @@ bool QAxWidgetExtraInfo::saveWidgetExtraInfo(DomWidget *ui_widget) /* Turn off standard setters and make sure "control" is in front, * otherwise, previews will not work as the properties are not applied via * the caching property sheet, them. */ - typedef QList<DomProperty *> DomPropertyList; + typedef QVector<DomProperty *> DomPropertyList; DomPropertyList props = ui_widget->elementProperty(); const int size = props.size(); const QString controlProperty = QLatin1String(QAxWidgetPropertySheet::controlPropertyName); diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp index 4e34f3872..bcf792771 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp @@ -117,7 +117,7 @@ QAxWidgetTaskMenu::~QAxWidgetTaskMenu() { } -QList<QAction*> QAxWidgetTaskMenu::taskActions() const +QVector<QAction*> QAxWidgetTaskMenu::taskActions() const { const bool loaded = m_axwidget->loaded(); m_setAction->setEnabled(!loaded); diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h index e1cf40af6..02bc4b8b6 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h +++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h @@ -43,7 +43,7 @@ class QAxWidgetTaskMenu: public QObject, public QDesignerTaskMenuExtension public: explicit QAxWidgetTaskMenu(QDesignerAxWidget *object, QObject *parent = 0); virtual ~QAxWidgetTaskMenu(); - QList<QAction*> taskActions() const override; + QVector<QAction*> taskActions() const override; private slots: void setActiveXControl(); @@ -53,7 +53,7 @@ private: QDesignerAxWidget *m_axwidget; QAction *m_setAction; QAction *m_resetAction; - QList<QAction*> m_taskActions; + QVector<QAction*> m_taskActions; }; typedef qdesigner_internal::ExtensionFactory<QDesignerTaskMenuExtension, QDesignerAxWidget, QAxWidgetTaskMenu> ActiveXTaskMenuFactory; diff --git a/src/designer/src/uiplugin/customwidget.h b/src/designer/src/uiplugin/customwidget.h index efb392009..1ba6ad33a 100644 --- a/src/designer/src/uiplugin/customwidget.h +++ b/src/designer/src/uiplugin/customwidget.h @@ -75,7 +75,7 @@ class QDesignerCustomWidgetCollectionInterface public: virtual ~QDesignerCustomWidgetCollectionInterface() {} - virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const = 0; + virtual QVector<QDesignerCustomWidgetInterface*> customWidgets() const = 0; }; #define QDesignerCustomWidgetCollectionInterface_iid "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface" diff --git a/src/designer/src/uiplugin/customwidget.qdoc b/src/designer/src/uiplugin/customwidget.qdoc index a63e0db7c..a49253c72 100644 --- a/src/designer/src/uiplugin/customwidget.qdoc +++ b/src/designer/src/uiplugin/customwidget.qdoc @@ -287,7 +287,7 @@ */ /*! - \fn QList<QDesignerCustomWidgetInterface*> QDesignerCustomWidgetCollectionInterface::customWidgets() const + \fn QVector<QDesignerCustomWidgetInterface*> QDesignerCustomWidgetCollectionInterface::customWidgets() const Returns a list of interfaces to the collection's custom widgets. */ diff --git a/src/designer/src/uitools/doc/src/qtuitools-index.qdoc b/src/designer/src/uitools/doc/src/qtuitools-index.qdoc index db73d8ac9..a63de0e50 100644 --- a/src/designer/src/uitools/doc/src/qtuitools-index.qdoc +++ b/src/designer/src/uitools/doc/src/qtuitools-index.qdoc @@ -57,50 +57,11 @@ \section1 Licenses and Attributions Qt UI Tools is available under commercial licenses from \l{The Qt Company}. - Since Qt 5.11, it is also available under the BSD 3-Clause - "New" or "Revised" License: - - \code -Copyright (C) 2018 The Qt Company Ltd. - -Commercial License Usage -Licensees holding valid commercial Qt licenses may use this file in -accordance with the commercial license agreement provided with the -Software or, alternatively, in accordance with the terms contained in -a written agreement between you and The Qt Company. For licensing terms -and conditions see https://www.qt.io/terms-conditions. For further -information use the contact form at https://www.qt.io/contact-us. - -BSD License Usage -Alternatively, you may use this file under the terms of the BSD license -as follows: - -"Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of The Qt Company Ltd nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - \endcode + In addition, it is available under free software licenses. Since Qt 6.0, + these free software licenses are + \l{GNU Lesser General Public License, version 3}, or + the \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. \section1 API Reference These are links to the API reference materials. diff --git a/src/designer/src/uitools/qtuitoolsglobal.h b/src/designer/src/uitools/qtuitoolsglobal.h new file mode 100644 index 000000000..40827b3ab --- /dev/null +++ b/src/designer/src/uitools/qtuitoolsglobal.h @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt UI Tools library of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTUITOOLSGLOBAL_H +#define QTUITOOLSGLOBAL_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_UITOOLS_LIB) +# define Q_UITOOLS_EXPORT Q_DECL_EXPORT +# else +# define Q_UITOOLS_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_UITOOLS_EXPORT +#endif + +QT_END_NAMESPACE + +#endif // QTUITOOLSGLOBAL_H + diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp index d1d4c5a73..058912f4f 100644 --- a/src/designer/src/uitools/quiloader.cpp +++ b/src/designer/src/uitools/quiloader.cpp @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Designer of the Qt Toolkit. +** This file is part of the Qt UI Tools library of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -400,7 +389,7 @@ public: return nullptr; } - void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; + void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; QWidget *create(DomUI *ui, QWidget *parentWidget) override; QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override; bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; @@ -431,7 +420,7 @@ static QString convertTranslatable(const DomProperty *p, const QByteArray &class return strVal->translate(className, idBased); } -void FormBuilderPrivate::applyProperties(QObject *o, const QList<DomProperty*> &properties) +void FormBuilderPrivate::applyProperties(QObject *o, const QVector<DomProperty*> &properties) { QFormBuilder::applyProperties(o, properties); diff --git a/src/designer/src/uitools/quiloader.h b/src/designer/src/uitools/quiloader.h index 82a01210b..7d632ab0b 100644 --- a/src/designer/src/uitools/quiloader.h +++ b/src/designer/src/uitools/quiloader.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Designer of the Qt Toolkit. +** This file is part of the Qt UI Tools library of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -51,6 +40,7 @@ #ifndef QUILOADER_H #define QUILOADER_H +#include <QtUiTools/qtuitoolsglobal.h> #include <QtCore/qobject.h> #include <QtCore/qscopedpointer.h> @@ -65,7 +55,7 @@ class QIODevice; class QDir; class QUiLoaderPrivate; -class QUiLoader : public QObject +class Q_UITOOLS_EXPORT QUiLoader : public QObject { Q_OBJECT public: diff --git a/src/designer/src/uitools/quiloader_p.h b/src/designer/src/uitools/quiloader_p.h index 0a6907a54..632eb6eff 100644 --- a/src/designer/src/uitools/quiloader_p.h +++ b/src/designer/src/uitools/quiloader_p.h @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Designer of the Qt Toolkit. +** This file is part of the Qt UI Tools library of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,35 +14,24 @@ ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -62,6 +51,7 @@ // We mean it. // +#include <QtUiTools/qtuitoolsglobal.h> #include <QtCore/qbytearray.h> #include <QtCore/qmetatype.h> @@ -106,7 +96,7 @@ namespace QFormInternal { #endif -extern const QUiItemRolePair qUiItemRoles[]; +extern const Q_UITOOLS_EXPORT QUiItemRolePair qUiItemRoles[]; #ifdef QFORMINTERNAL_NAMESPACE } diff --git a/src/designer/src/uitools/uitools.pro b/src/designer/src/uitools/uitools.pro index 8a71fa8b1..169211f9e 100644 --- a/src/designer/src/uitools/uitools.pro +++ b/src/designer/src/uitools/uitools.pro @@ -1,5 +1,4 @@ TARGET = QtUiTools -CONFIG += static include(../lib/uilib/uilib.pri) |