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/plugin.h | |
| parent | 463b8d7bb53ae5ea08ec6caafdf1754ca015603a (diff) | |
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/plugin.h')
| -rw-r--r-- | src/controls/plugin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/plugin.h b/src/controls/plugin.h index 77cee03f7..089d752fa 100644 --- a/src/controls/plugin.h +++ b/src/controls/plugin.h @@ -50,12 +50,12 @@ QT_BEGIN_NAMESPACE -class QtQuickControlsPlugin: public QQmlExtensionPlugin +class QtQuickControls1Plugin: public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: - QtQuickControlsPlugin(QObject *parent = 0); + QtQuickControls1Plugin(QObject *parent = 0); void registerTypes(const char *uri); void initializeEngine(QQmlEngine *engine, const char *uri); private: |