diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-04 14:15:49 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-09 06:01:55 +0000 |
| commit | 472040571181ffe3974df73765d1ba904e9385e2 (patch) | |
| tree | 9881bbdb4cb1b862bad856feffa37e21f9f94090 /src/render | |
| parent | 36ee501dbfdaad4e85fb4d5a7b96ec7676b20c6a (diff) | |
SceneIOHandler is now private API
Change-Id: I7e624c6fcdf36a221d332b8dbfea9108a46adcf5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/backend/renderer.cpp | 2 | ||||
| -rw-r--r-- | src/render/io/io.pri | 2 | ||||
| -rw-r--r-- | src/render/io/qabstractsceneloader.cpp | 2 | ||||
| -rw-r--r-- | src/render/io/qsceneiohandler.cpp | 2 | ||||
| -rw-r--r-- | src/render/io/qsceneiohandler_p.h (renamed from src/render/io/qsceneiohandler.h) | 4 | ||||
| -rw-r--r-- | src/render/io/qsceneparserfactory.cpp | 2 | ||||
| -rw-r--r-- | src/render/jobs/loadscenejob.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 4a0f6ff46..833ac011c 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -49,8 +49,8 @@ #include <Qt3DRender/qtechnique.h> #include <Qt3DRender/qrenderaspect.h> #include <Qt3DRender/qeffect.h> -#include <Qt3DRender/qsceneiohandler.h> +#include <Qt3DRender/private/qsceneiohandler_p.h> #include <Qt3DRender/private/renderviewjob_p.h> #include <Qt3DRender/private/renderstates_p.h> #include <Qt3DRender/private/cameraselectornode_p.h> diff --git a/src/render/io/io.pri b/src/render/io/io.pri index 48d637003..e35ad2ffe 100644 --- a/src/render/io/io.pri +++ b/src/render/io/io.pri @@ -10,7 +10,7 @@ HEADERS += \ $$PWD/scene_p.h \ $$PWD/scenemanager_p.h \ $$PWD/qsceneparserfactory_p.h \ - $$PWD/qsceneiohandler.h \ + $$PWD/qsceneiohandler_p.h \ $$PWD/qsceneparserplugin.h \ $$PWD/glbuffer_p.h diff --git a/src/render/io/qabstractsceneloader.cpp b/src/render/io/qabstractsceneloader.cpp index 46e06effd..ddb88cc08 100644 --- a/src/render/io/qabstractsceneloader.cpp +++ b/src/render/io/qabstractsceneloader.cpp @@ -39,7 +39,7 @@ #include "qabstractsceneloader.h" #include "qabstractsceneloader_p.h" -#include "qsceneiohandler.h" +#include "qsceneiohandler_p.h" #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/io/qsceneiohandler.cpp b/src/render/io/qsceneiohandler.cpp index 67ec18eb3..fdcf5e44d 100644 --- a/src/render/io/qsceneiohandler.cpp +++ b/src/render/io/qsceneiohandler.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "qsceneiohandler.h" +#include "qsceneiohandler_p.h" #include <Qt3DRender/private/renderlogging_p.h> #include <QStringList> diff --git a/src/render/io/qsceneiohandler.h b/src/render/io/qsceneiohandler_p.h index 72d898533..036923cb1 100644 --- a/src/render/io/qsceneiohandler.h +++ b/src/render/io/qsceneiohandler_p.h @@ -44,7 +44,7 @@ #include <QStringList> #include <QLoggingCategory> #include <QUrl> -#include <Qt3DRender/qt3drender_global.h> +#include <private/qt3drender_global_p.h> QT_BEGIN_NAMESPACE @@ -56,7 +56,7 @@ namespace Qt3DRender { Q_DECLARE_LOGGING_CATEGORY(SceneParsers) -class QT3DRENDERSHARED_EXPORT QSceneIOHandler : public QObject +class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneIOHandler : public QObject { Q_OBJECT Q_PROPERTY(ParserStatus status READ status NOTIFY statusChanged) diff --git a/src/render/io/qsceneparserfactory.cpp b/src/render/io/qsceneparserfactory.cpp index 97eb7c0e7..de1c80a91 100644 --- a/src/render/io/qsceneparserfactory.cpp +++ b/src/render/io/qsceneparserfactory.cpp @@ -39,7 +39,7 @@ #include "qsceneparserfactory_p.h" #include "qsceneparserplugin.h" -#include "qsceneiohandler.h" +#include "qsceneiohandler_p.h" #include <QtCore/private/qfactoryloader_p.h> #include <QtCore/QCoreApplication> diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp index e93441049..354a233e4 100644 --- a/src/render/jobs/loadscenejob.cpp +++ b/src/render/jobs/loadscenejob.cpp @@ -43,7 +43,7 @@ #include <private/scenemanager_p.h> #include <Qt3DCore/qentity.h> #include <Qt3DRender/private/job_common_p.h> -#include <Qt3DRender/qsceneiohandler.h> +#include <Qt3DRender/private/qsceneiohandler_p.h> QT_BEGIN_NAMESPACE |