1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add name() getter in QPlatformTheme

Browse Source 
This patch adds a getter for the current platform theme's name.
It is populated by QPlatformThemeFactory::create() if a plugin has been
loaded successfully.

Change-Id: I2c891c46e7dfcc262c35e32e345ae3dc2623e3a5
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Axel Spoerl 2022-11-18 10:52:13 +01:00
parent 626ec74359
commit 5809c6fffd
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/kernel/qplatformtheme.cpp
View File

@ -850,6 +850,11 @@ unsigned QPlatformThemePrivate::currentKeyPlatforms()
return result; return result;
} }
QString QPlatformTheme::name() const
{
return d_func()->name;
}
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qplatformtheme.cpp" #include "moc_qplatformtheme.cpp"

4
src/gui/kernel/qplatformtheme.h
View File

@ -317,10 +317,14 @@ public:
static QVariant defaultThemeHint(ThemeHint hint); static QVariant defaultThemeHint(ThemeHint hint);
static QString defaultStandardButtonText(int button); static QString defaultStandardButtonText(int button);
static QString removeMnemonics(const QString &original); static QString removeMnemonics(const QString &original);
QString name() const;
protected: protected:
explicit QPlatformTheme(QPlatformThemePrivate *priv); explicit QPlatformTheme(QPlatformThemePrivate *priv);
QScopedPointer<QPlatformThemePrivate> d_ptr; QScopedPointer<QPlatformThemePrivate> d_ptr;
private:
friend class QPlatformThemeFactory;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/gui/kernel/qplatformtheme_p.h
View File

@ -41,6 +41,8 @@ public:
static unsigned currentKeyPlatforms(); static unsigned currentKeyPlatforms();
QPalette *systemPalette; QPalette *systemPalette;
QString name;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

7
src/gui/kernel/qplatformthemefactory.cpp
View File

@ -8,6 +8,8 @@
#include "qmutex.h" #include "qmutex.h"
#include "qguiapplication.h" #include "qguiapplication.h"
#include "qplatformtheme.h"
#include "qplatformtheme_p.h"
#include "qdebug.h" #include "qdebug.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -22,7 +24,10 @@ QPlatformTheme *QPlatformThemeFactory::create(const QString& key, const QString
QStringList paramList = key.split(u':'); QStringList paramList = key.split(u':');
const QString platform = paramList.takeFirst().toLower(); const QString platform = paramList.takeFirst().toLower();
loader->setExtraSearchPath(platformPluginPath); loader->setExtraSearchPath(platformPluginPath);
return qLoadPlugin<QPlatformTheme, QPlatformThemePlugin>(loader(), platform, paramList); QPlatformTheme *theme = qLoadPlugin<QPlatformTheme, QPlatformThemePlugin>(loader(), platform, paramList);
if (theme)
theme->d_func()->name = key;
return theme;
} }
/*! /*!