diff options
Diffstat (limited to 'src/designer/src/lib/shared')
| -rw-r--r-- | src/designer/src/lib/shared/dialoggui.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/iconloader.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/plugindialog.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/previewmanager.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/sheet_delegate.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/widgetfactory.cpp | 4 |
6 files changed, 8 insertions, 6 deletions
diff --git a/src/designer/src/lib/shared/dialoggui.cpp b/src/designer/src/lib/shared/dialoggui.cpp index 73d5e0514..be5f3a7f3 100644 --- a/src/designer/src/lib/shared/dialoggui.cpp +++ b/src/designer/src/lib/shared/dialoggui.cpp @@ -39,7 +39,7 @@ #include <QtCore/QSet> // QFileDialog on X11 does not provide an image preview. Display icons. -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) # define IMAGE_PREVIEW #endif diff --git a/src/designer/src/lib/shared/iconloader.cpp b/src/designer/src/lib/shared/iconloader.cpp index 4007f43f2..9ac8e96b9 100644 --- a/src/designer/src/lib/shared/iconloader.cpp +++ b/src/designer/src/lib/shared/iconloader.cpp @@ -40,7 +40,7 @@ QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name) { QStringList candidates = QStringList() << (QString::fromUtf8(":/qt-project.org/formeditor/images/") + name) -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS << (QString::fromUtf8(":/qt-project.org/formeditor/images/mac/") + name) #else << (QString::fromUtf8(":/qt-project.org/formeditor/images/win/") + name) diff --git a/src/designer/src/lib/shared/plugindialog.cpp b/src/designer/src/lib/shared/plugindialog.cpp index 998d23247..827dd8c68 100644 --- a/src/designer/src/lib/shared/plugindialog.cpp +++ b/src/designer/src/lib/shared/plugindialog.cpp @@ -48,7 +48,7 @@ namespace qdesigner_internal { PluginDialog::PluginDialog(QDesignerFormEditorInterface *core, QWidget *parent) : QDialog(parent -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS , Qt::Tool #endif ), m_core(core) diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp index ba4d1ca8a..63520b0ec 100644 --- a/src/designer/src/lib/shared/previewmanager.cpp +++ b/src/designer/src/lib/shared/previewmanager.cpp @@ -865,7 +865,7 @@ bool PreviewManager::eventFilter(QObject *watched, QEvent *event) const QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event); const int key = keyEvent->key(); if ((key == Qt::Key_Escape -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS || (keyEvent->modifiers() == Qt::ControlModifier && key == Qt::Key_Period) #endif )) { diff --git a/src/designer/src/lib/shared/sheet_delegate.cpp b/src/designer/src/lib/shared/sheet_delegate.cpp index 255ce3b97..60a2cd963 100644 --- a/src/designer/src/lib/shared/sheet_delegate.cpp +++ b/src/designer/src/lib/shared/sheet_delegate.cpp @@ -53,7 +53,7 @@ void SheetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, QStyleOptionButton buttonOption; buttonOption.state = option.state; -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS buttonOption.state |= QStyle::State_Raised; #endif buttonOption.state &= ~QStyle::State_HasFocus; diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp index 30b5d8583..295665d00 100644 --- a/src/designer/src/lib/shared/widgetfactory.cpp +++ b/src/designer/src/lib/shared/widgetfactory.cpp @@ -110,8 +110,10 @@ bool ComboEventFilter::eventFilter(QObject *watched, QEvent *event) { if (event->type() == QEvent::ChildPolished) { QComboBox *cb = static_cast<QComboBox*>(watched); - if (QLineEdit *le = cb->lineEdit()) + if (QLineEdit *le = cb->lineEdit()) { le->setFocusPolicy(Qt::NoFocus); + le->setCursor(Qt::ArrowCursor); + } } return QObject::eventFilter(watched, event); } |