diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-23 13:58:55 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-25 13:51:55 +0100 |
| commit | 7b50b1e5bd6b1b8891fc2c133d3a5bc8b11786c5 (patch) | |
| tree | d06d23efb6c851e866a5120337edfca7d0761c6f /src/shared | |
| parent | 5d2e4c29d4413166faa0ba2d70a89497d2c8829b (diff) | |
| download | qttools-7b50b1e5bd6b1b8891fc2c133d3a5bc8b11786c5.tar.gz | |
Qt Designer: Disambiguate static variables and functions
They cause conflicts in CMake Unity (Jumbo) builds.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I896678dd4c189c27b59b1338881702dcbe5f7e88
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/findwidget/abstractfindwidget.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp index 254414a0e..517273494 100644 --- a/src/shared/findwidget/abstractfindwidget.cpp +++ b/src/shared/findwidget/abstractfindwidget.cpp @@ -35,7 +35,7 @@ QT_BEGIN_NAMESPACE -static QIcon createIconSet(const QString &name) +static QIcon afwCreateIconSet(const QString &name) { QStringList candidates = QStringList() << (QString::fromUtf8(":/qt-project.org/shared/images/") + name) @@ -77,7 +77,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent) #endif m_toolClose = new QToolButton(this); - m_toolClose->setIcon(createIconSet(QLatin1String("closetab.png"))); + m_toolClose->setIcon(afwCreateIconSet(QLatin1String("closetab.png"))); m_toolClose->setAutoRaise(true); layOut->addWidget(m_toolClose); connect(m_toolClose, SIGNAL(clicked()), SLOT(deactivate())); @@ -92,7 +92,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent) m_toolPrevious->setAutoRaise(true); m_toolPrevious->setText(tr("&Previous")); m_toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - m_toolPrevious->setIcon(createIconSet(QLatin1String("previous.png"))); + m_toolPrevious->setIcon(afwCreateIconSet(QLatin1String("previous.png"))); layOut->addWidget(m_toolPrevious); connect(m_toolPrevious, SIGNAL(clicked()), SLOT(findPrevious())); @@ -100,7 +100,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent) m_toolNext->setAutoRaise(true); m_toolNext->setText(tr("&Next")); m_toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - m_toolNext->setIcon(createIconSet(QLatin1String("next.png"))); + m_toolNext->setIcon(afwCreateIconSet(QLatin1String("next.png"))); layOut->addWidget(m_toolNext); connect(m_toolNext, SIGNAL(clicked()), SLOT(findNext())); @@ -167,7 +167,7 @@ AbstractFindWidget::~AbstractFindWidget() = default; */ QIcon AbstractFindWidget::findIconSet() { - return createIconSet(QLatin1String("searchfind.png")); + return afwCreateIconSet(QLatin1String("searchfind.png")); } /*! |