diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-10-03 17:04:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-03 17:48:34 +0200 |
| commit | 4ce2c0310c55c78b783b79c1f3fa2e0aa40fe6a2 (patch) | |
| tree | 87377c239ce939b9ccb11680e326ca90ca9d44c0 /src/quick/util/qquickstatechangescript_p.h | |
| parent | df0347a9ed8be8e1d3d771c3d2abcfebec9ed87d (diff) | |
Remane private QQuickAction into QQuickStateAction
This avoid symbol conflicts when statically linking with Qt Quick
Controls, that has its own QQuickAction class and which may become
public some day. (QQuickPropertyAction might be a more apt name, but
it's already taken).
Change-Id: Ia9514d63d38295603a89d8ec5a88815a651380f7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/quick/util/qquickstatechangescript_p.h')
| -rw-r--r-- | src/quick/util/qquickstatechangescript_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickstatechangescript_p.h b/src/quick/util/qquickstatechangescript_p.h index 29755b1b14..1366002831 100644 --- a/src/quick/util/qquickstatechangescript_p.h +++ b/src/quick/util/qquickstatechangescript_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QQuickStateChangeScriptPrivate; -class Q_AUTOTEST_EXPORT QQuickStateChangeScript : public QQuickStateOperation, public QQuickActionEvent +class Q_AUTOTEST_EXPORT QQuickStateChangeScript : public QQuickStateOperation, public QQuickStateActionEvent { Q_OBJECT Q_DECLARE_PRIVATE(QQuickStateChangeScript) |