diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-26 09:22:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-28 21:17:51 +0000 |
| commit | 1d9bb3c433e605e07e07a703422c6e837143e775 (patch) | |
| tree | 697c477f65c4a6401735f1bbbebe09a40202bd68 /src/designer/src/lib/shared/qtresourceview.cpp | |
| parent | 709c4a9c065a2a96f601c99374d7ce555226749f (diff) | |
Qt Designer: Port to new configure system
Replace the old QT_NO... define checks by the configure features where
applicable.
Join the sections for the QTimeEdit/QDateEdit (inheriting
QDateTimeEdit).
For the printer, introduce a define depending on the availability
of the printsupport library and QPrintDialog (cf textedit example)
to accommodate platforms that don't build QtPrintSupport.
Task-number: PYSIDE-797
Change-Id: I752d99a19b55616fa2ac5c36fad803d6d861e327
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/lib/shared/qtresourceview.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/qtresourceview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp index 150d2c8b8..e20b9c0d3 100644 --- a/src/designer/src/lib/shared/qtresourceview.cpp +++ b/src/designer/src/lib/shared/qtresourceview.cpp @@ -50,7 +50,7 @@ #include <QtWidgets/qpushbutton.h> #include <QtWidgets/qmessagebox.h> #include <QtWidgets/qapplication.h> -#ifndef QT_NO_CLIPBOARD +#if QT_CONFIG(clipboard) #include <QtGui/qclipboard.h> #endif #include <QtWidgets/qmenu.h> @@ -134,7 +134,7 @@ public: void slotResourceActivated(QListWidgetItem *); void slotEditResources(); void slotReloadResources(); -#ifndef QT_NO_CLIPBOARD +#if QT_CONFIG(clipboard) void slotCopyResourcePath(); #endif void slotListWidgetContextMenuRequested(const QPoint &pos); @@ -238,7 +238,7 @@ void QtResourceViewPrivate::slotReloadResources() } } -#ifndef QT_NO_CLIPBOARD +#if QT_CONFIG(clipboard) void QtResourceViewPrivate::slotCopyResourcePath() { const QString path = q_ptr->selectedResource(); @@ -574,7 +574,7 @@ QtResourceView::QtResourceView(QDesignerFormEditorInterface *core, QWidget *pare connect(d_ptr->m_reloadResourcesAction, SIGNAL(triggered()), this, SLOT(slotReloadResources())); d_ptr->m_reloadResourcesAction->setEnabled(false); -#ifndef QT_NO_CLIPBOARD +#if QT_CONFIG(clipboard) QIcon copyIcon = QIcon::fromTheme(QStringLiteral("edit-copy"), qdesigner_internal::createIconSet(QStringLiteral("editcopy.png"))); d_ptr->m_copyResourcePathAction = new QAction(copyIcon, tr("Copy Path"), this); connect(d_ptr->m_copyResourcePathAction, SIGNAL(triggered()), this, SLOT(slotCopyResourcePath())); |