diff options
Diffstat (limited to 'src/designer')
8 files changed, 10 insertions, 25 deletions
diff --git a/src/designer/designer.pro b/src/designer/designer.pro index be734fb11..a4c2c27b8 100644 --- a/src/designer/designer.pro +++ b/src/designer/designer.pro @@ -1,3 +1,7 @@ +include($$OUT_PWD/../../src/global/qttools-config.pri) +QT_FOR_CONFIG += tools-private +requires(qtConfig(designer)) + TEMPLATE = subdirs SUBDIRS = src diff --git a/src/designer/src/components/formeditor/dpi_chooser.cpp b/src/designer/src/components/formeditor/dpi_chooser.cpp index a254bf12a..5e2f9f605 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, const QString &>::of(&QComboBox::currentIndexChanged), + connect(m_predefinedCombo, QOverload<int>::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 062fc6e4f..85cc1f930 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, const QString &>::of(&QComboBox::currentIndexChanged), + EmbeddedOptionsControl::connect(m_profileCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), m_q, &EmbeddedOptionsControl::slotProfileIndexChanged); m_addButton->setIcon(createIconSet(QString::fromUtf8("plus.png"))); diff --git a/src/designer/src/designer/doc/src/designer-manual.qdoc b/src/designer/src/designer/doc/src/designer-manual.qdoc index 99f45ecdd..5c6fd208a 100644 --- a/src/designer/src/designer/doc/src/designer-manual.qdoc +++ b/src/designer/src/designer/doc/src/designer-manual.qdoc @@ -90,7 +90,6 @@ /*! \page designer-to-know.html - \contentspage {Qt Designer Manual}{Contents} \title Getting to Know Qt Designer @@ -258,7 +257,6 @@ /*! \page designer-quick-start.html - \contentspage {Qt Designer Manual}{Contents} \title A Quick Start to Qt Designer @@ -398,7 +396,6 @@ /*! \page designer-editing-mode.html \previouspage Getting to Know Qt Designer - \contentspage {Qt Designer Manual}{Contents} \nextpage Using Layouts in Qt Designer \title Qt Designer's Editing Modes @@ -447,7 +444,6 @@ /*! \page designer-widget-mode.html \previouspage Qt Designer's Editing Modes - \contentspage {Qt Designer Manual}{Contents} \nextpage Qt Designer's Signals and Slots Editing Mode \title Qt Designer's Widget Editing Mode @@ -687,7 +683,6 @@ /*! \page designer-layouts.html \previouspage Qt Designer's Widget Editing Mode - \contentspage \nextpage Qt Designer's Signals and Slots Editing Mode \title Using Layouts in Qt Designer @@ -890,7 +885,6 @@ /*! \page designer-preview.html - \contentspage {Qt Designer Manual}{Contents} \previouspage Using Layouts in Qt Designer \nextpage Qt Designer's Buddy Editing Mode \title Saving, Previewing and Printing Forms in Qt Designer @@ -971,7 +965,6 @@ /*! \page designer-connection-mode.html - \contentspage {Qt Designer Manual}{Contents} \previouspage Using Layouts in Qt Designer \nextpage Qt Designer's Buddy Editing Mode @@ -1105,7 +1098,6 @@ /*! \page designer-buddy-mode.html - \contentspage{Qt Designer Manual}{Contents} \previouspage Qt Designer's Signals and Slots Editing Mode \nextpage Qt Designer's Tab Order Editing Mode @@ -1159,7 +1151,6 @@ /*! \page designer-tab-order.html - \contentspage {Qt Designer Manual}{Contents} \previouspage Qt Designer's Buddy Editing Mode \nextpage Using Containers in Qt Designer @@ -1208,7 +1199,6 @@ /*! \page designer-using-containers.html - \contentspage {Qt Designer Manual}{Contents} \previouspage Qt Designer's Tab Order Editing Mode \nextpage Creating Main Windows in Qt Designer @@ -1346,7 +1336,6 @@ /*! \page designer-creating-mainwindows.html - \contentspage {Qt Designer Manual}{Contents} \previouspage Using Containers in Qt Designer \nextpage Editing Resources with Qt Designer @@ -1601,7 +1590,6 @@ /*! \page designer-resources.html - \contentspage {Qt Designer Manual}{Contents} \previouspage Creating Main Windows in Qt Designer \nextpage Using Stylesheets with Qt Designer @@ -1706,7 +1694,6 @@ pixmap property in the property editor. /*! \page designer-stylesheet.html - \contentspage {Qt Designer Manual}{Contents} \previouspage Editing Resources with Qt Designer \nextpage Using a Designer UI File in Your Application @@ -1734,7 +1721,6 @@ pixmap property in the property editor. /*! \page designer-using-a-ui-file.html \previouspage Using Stylesheets with Qt Designer - \contentspage {Qt Designer Manual}{Contents} \nextpage Using Custom Widgets with Qt Designer \title Using a Designer UI File in Your Application @@ -2128,7 +2114,6 @@ pixmap property in the property editor. /*! \page designer-customizing-forms.html - \contentspage {Qt Designer Manual}{Contents} \previouspage Using Stylesheets with Qt Designer \nextpage Using Custom Widgets with Qt Designer @@ -2185,7 +2170,6 @@ pixmap property in the property editor. /*! \page designer-using-custom-widgets.html - \contentspage {Qt Designer Manual}{Contents} \previouspage Customizing Qt Designer Forms \nextpage Creating Custom Widgets for Qt Designer @@ -2281,7 +2265,6 @@ pixmap property in the property editor. /*! \page designer-creating-custom-widgets.html \previouspage Using Custom Widgets with Qt Designer - \contentspage {Qt Designer Manual}{Contents} \nextpage Creating Custom Widget Extensions \title Creating Custom Widgets for Qt Designer @@ -2642,7 +2625,6 @@ pixmap property in the property editor. \page designer-creating-custom-widgets-extensions.html \previouspage Creating Custom Widgets for Qt Designer \nextpage Qt Designer's UI File Format - \contentspage {Qt Designer Manual}{Contents} \title Creating Custom Widget Extensions @@ -2812,7 +2794,6 @@ pixmap property in the property editor. /*! \page designer-ui-file-format.html \previouspage Creating Custom Widget Extensions - \contentspage {Qt Designer Manual}{Contents} \title Qt Designer's UI File Format diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.cpp b/src/designer/src/designer/qdesigner_appearanceoptions.cpp index fbcfacc6e..66eb49c9f 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, const QString &>::of(&QComboBox::currentIndexChanged), + connect(m_ui->m_uiModeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &QDesignerAppearanceOptionsWidget::slotUiModeComboChanged); m_ui->m_fontPanel->setCheckable(true); diff --git a/src/designer/src/lib/shared/formlayoutmenu.cpp b/src/designer/src/lib/shared/formlayoutmenu.cpp index 220c3805b..87e8561c3 100644 --- a/src/designer/src/lib/shared/formlayoutmenu.cpp +++ b/src/designer/src/lib/shared/formlayoutmenu.cpp @@ -155,7 +155,7 @@ FormLayoutRowDialog::FormLayoutRowDialog(QDesignerFormEditorInterface *core, m_ui.fieldClassComboBox->addItems(fieldWidgetClasses(core)); m_ui.fieldClassComboBox->setCurrentIndex(0); connect(m_ui.fieldClassComboBox, - QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), + QOverload<int>::of(&QComboBox::currentIndexChanged), this, &FormLayoutRowDialog::fieldClassChanged); updateOkButton(); diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp index 67e08c475..81812f2fb 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, const QString &>::of(&QComboBox::currentIndexChanged), + &QComboBox::currentIndexChanged, this, &NewFormWidget::slotDeviceProfileIndexChanged); if (m_deviceProfiles.isEmpty()) { m_ui->profileComboBox->setEnabled(false); diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp index 1f7649975..462d74005 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, const QString &>::of(&QComboBox::currentIndexChanged), + connect(m_impl->skinCombo(), &QComboBox::currentIndexChanged, this, &PreviewConfigurationWidget::slotSkinChanged); m_impl->retrieveSettings(); |