diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-21 11:09:50 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-23 07:41:18 +0000 |
| commit | 458fa46f8c1ef2abb8123e536ed9555ecfcc2aa4 (patch) | |
| tree | e723995be943a95d7d85cb0af9de31dc74eb9ca3 | |
| parent | cdf9746aaf44178215bf5c7361af4a6219a0f5a1 (diff) | |
| download | qttools-458fa46f8c1ef2abb8123e536ed9555ecfcc2aa4.tar.gz | |
Qt Designer: No longer load layout icons from the icon theme.
It may happen that all layout icons look identical due to the lookup
algorithm falling back to generic icons. For example, for both
"designer-horizontal-layout" and "designer-vertical-layout"
an identical icon "designer" may be returned.
Task-number: QTBUG-43021
Task-number: QTCREATORBUG-15199
Change-Id: I7820566d38093381c9e3e1386b769a7200d67843
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| -rw-r--r-- | src/designer/src/components/formeditor/formwindowmanager.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp index 55db0eef4..000c9d52f 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.cpp +++ b/src/designer/src/components/formeditor/formwindowmanager.cpp @@ -526,17 +526,6 @@ void FormWindowManager::setupActions() connect(m_actionShowFormWindowSettingsDialog, &QAction::triggered, this, &FormWindowManager::slotActionShowFormWindowSettingsDialog); m_actionShowFormWindowSettingsDialog->setEnabled(false); - -#if defined (Q_OS_UNIX) && !defined(Q_OS_MAC) - // These do not currently exist, but will allow theme authors to fill in the gaps - m_actionBreakLayout->setIcon(QIcon::fromTheme(QStringLiteral("designer-break-layout"), m_actionBreakLayout->icon())); - m_actionGridLayout->setIcon(QIcon::fromTheme(QStringLiteral("designer-grid-layout"), m_actionGridLayout->icon())); - m_actionHorizontalLayout->setIcon(QIcon::fromTheme(QStringLiteral("designer-horizontal-layout"), m_actionHorizontalLayout->icon())); - m_actionVerticalLayout->setIcon(QIcon::fromTheme(QStringLiteral("designer-vertical-layout"), m_actionVerticalLayout->icon())); - m_actionSplitHorizontal->setIcon(QIcon::fromTheme(QStringLiteral("designer-split-horizontal"), m_actionSplitHorizontal->icon())); - m_actionSplitVertical->setIcon(QIcon::fromTheme(QStringLiteral("designer-split-vertical"), m_actionSplitVertical->icon())); - m_actionAdjustSize->setIcon(QIcon::fromTheme(QStringLiteral("designer-adjust-size"), m_actionAdjustSize->icon())); -#endif } #ifndef QT_NO_CLIPBOARD |