diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-03-17 16:34:58 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-18 08:12:15 +0000 |
| commit | 5cf6ad9165cc38b7b2a7e2421d70f0d93256c866 (patch) | |
| tree | 09f63a49f570bc5f4d3b3a922c4112a1d2ab37d1 /src/controls/qquickdesktopiconprovider_p.h | |
| parent | 463b8d7bb53ae5ea08ec6caafdf1754ca015603a (diff) | |
| download | qtquickcontrols-5cf6ad9165cc38b7b2a7e2421d70f0d93256c866.tar.gz | |
Controls: append "1" to all C++ classes
This is consistent with the classes that have already had this done.
It prevents clashes with Qt Quick Controls 2.
These classes are not available to the user, so it doesn't affect
compatibility.
Change-Id: Iee73ee6bc530182732ae95993e1f4fc3766eb8e0
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickdesktopiconprovider_p.h')
| -rw-r--r-- | src/controls/qquickdesktopiconprovider_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/qquickdesktopiconprovider_p.h b/src/controls/qquickdesktopiconprovider_p.h index 75281cd2..6e9e94a0 100644 --- a/src/controls/qquickdesktopiconprovider_p.h +++ b/src/controls/qquickdesktopiconprovider_p.h @@ -46,10 +46,10 @@ QT_BEGIN_NAMESPACE // Load icons from desktop theme -class QQuickDesktopIconProvider : public QQuickImageProvider +class QQuickDesktopIconProvider1 : public QQuickImageProvider { public: - QQuickDesktopIconProvider() + QQuickDesktopIconProvider1() : QQuickImageProvider(QQuickImageProvider::Pixmap) { } |