diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:04:17 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:04:17 +0100 |
commit | bf40a6cbf6b0045c157431f2717697c37bd20697 (patch) | |
tree | 1c0ec64c7e4833d5f70f4816a55913353ed31ec9 /src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h | |
parent | d51c6983baedc283020b39062714962b6b7d0c5e (diff) | |
parent | f4ce60ca6b92c5cbfebf7ed5f8436e5d84bfeab4 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Change-Id: I9b3faae3e87e1c68ae34bac278f08087dc6ac1a9
Diffstat (limited to 'src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h')
-rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h b/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h index 83863be20..416a2280d 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h +++ b/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h @@ -70,7 +70,7 @@ namespace Quick { class Scene2DManager; -class Q_AUTOTEST_EXPORT Scene2DSharedObject +class QT3DQUICKSCENE2DSHARED_EXPORT Scene2DSharedObject { public: Scene2DSharedObject(Scene2DManager *manager); |