diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-22 14:47:51 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-22 14:57:04 +0100 |
| commit | a768780f36a9913d4371c4a61706fc90bbba18c5 (patch) | |
| tree | 141606d8b87fcb932172444369fa0df5cf1acf9a /src/quick/handlers/qquickdragaxis_p.h | |
| parent | b7eebec9597b38fed52710bc1dcc166d456a415d (diff) | |
| parent | 56b3232a7d35fe2b856d1d87a7e1c59906b46681 (diff) | |
Merge remote-tracking branch 'origin/5.13' into HEAD
Conflicts:
src/qml/compiler/qv4compileddata_p.h
src/qml/jit/qv4baselinejit.cpp
src/qml/jit/qv4jithelpers.cpp
src/qml/jsruntime/qv4lookup.cpp
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4runtimeapi_p.h
src/qml/jsruntime/qv4vme_moth.cpp
src/qml/qml/qqmltypemodule_p.h
Change-Id: If28793e9e08418457a11fc2c5832f03cab2fcc76
Diffstat (limited to 'src/quick/handlers/qquickdragaxis_p.h')
| -rw-r--r-- | src/quick/handlers/qquickdragaxis_p.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/quick/handlers/qquickdragaxis_p.h b/src/quick/handlers/qquickdragaxis_p.h index 2c2e0a426d..a4649d5eb9 100644 --- a/src/quick/handlers/qquickdragaxis_p.h +++ b/src/quick/handlers/qquickdragaxis_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtQuick module of the Qt Toolkit. @@ -51,10 +51,11 @@ // We mean it. // -#include <QtCore/qobject.h> -#include <QtCore/qglobal.h> +#include <private/qtquickglobal_p.h> -class Q_AUTOTEST_EXPORT QQuickDragAxis : public QObject +QT_BEGIN_NAMESPACE + +class Q_QUICK_PRIVATE_EXPORT QQuickDragAxis : public QObject { Q_OBJECT Q_PROPERTY(qreal minimum READ minimum WRITE setMinimum NOTIFY minimumChanged) @@ -84,4 +85,6 @@ private: bool m_enabled; }; +QT_END_NAMESPACE + #endif // QQUICKDRAGAXIS_P_H |