diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-01-29 11:39:54 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-02-01 12:27:26 +0000 |
| commit | 30ce32c22e6ba7e8315a0669c43f92fba22c1132 (patch) | |
| tree | 919de4ad695a157f571a2a6ba5e02f491868faaf /tools | |
| parent | 2f21d09e30e9fff34fd7f0832df208fba8a7ff1c (diff) | |
Make some headers private
Eventually most (perhaps all) classes in the runtime will become
private since the user-facing API is Studio3D and the
yet-to-be-implemented 3DS1-style C++ APIs.
Start some progress on this.
Change-Id: Ia145f114d1b57ecc8aa0902859d8715474563031
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/q3dsviewer/main.cpp | 6 | ||||
| -rw-r--r-- | tools/q3dsviewer/q3dsmainwindow.cpp | 2 | ||||
| -rw-r--r-- | tools/q3dsviewer/q3dsviewer.pro | 2 | ||||
| -rw-r--r-- | tools/qt3dsexplorer/main.cpp | 6 | ||||
| -rw-r--r-- | tools/qt3dsexplorer/qt3dsexplorer.pro | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/tools/q3dsviewer/main.cpp b/tools/q3dsviewer/main.cpp index 9376b21..8c4a7d1 100644 --- a/tools/q3dsviewer/main.cpp +++ b/tools/q3dsviewer/main.cpp @@ -31,10 +31,10 @@ #include <QCommandLineParser> #include <QFileDialog> #include <QStandardPaths> -#include <Qt3DStudioRuntime2/q3dsutils.h> +#include <Q3DSEngine> +#include <Q3DSWindow> +#include <private/q3dsutils_p.h> #include "q3dsmainwindow.h" -#include "q3dsengine.h" -#include "q3dswindow.h" int main(int argc, char *argv[]) { diff --git a/tools/q3dsviewer/q3dsmainwindow.cpp b/tools/q3dsviewer/q3dsmainwindow.cpp index ca1198b..5a474ca 100644 --- a/tools/q3dsviewer/q3dsmainwindow.cpp +++ b/tools/q3dsviewer/q3dsmainwindow.cpp @@ -30,7 +30,7 @@ #include "q3dsmainwindow.h" #include <Qt3DStudioRuntime2/q3dswindow.h> #include <Qt3DStudioRuntime2/q3dsengine.h> -#include <Qt3DStudioRuntime2/q3dsutils.h> +#include <Qt3DStudioRuntime2/private/q3dsutils_p.h> #include <QApplication> #include <QMenuBar> #include <QMenu> diff --git a/tools/q3dsviewer/q3dsviewer.pro b/tools/q3dsviewer/q3dsviewer.pro index 85baa7b..45c0cd9 100644 --- a/tools/q3dsviewer/q3dsviewer.pro +++ b/tools/q3dsviewer/q3dsviewer.pro @@ -1,4 +1,4 @@ -QT += widgets 3dstudioruntime2 +QT += widgets 3dstudioruntime2-private SOURCES += \ main.cpp \ diff --git a/tools/qt3dsexplorer/main.cpp b/tools/qt3dsexplorer/main.cpp index eafa905..dcba07d 100644 --- a/tools/qt3dsexplorer/main.cpp +++ b/tools/qt3dsexplorer/main.cpp @@ -31,9 +31,9 @@ #include <QApplication> #include <QCommandLineParser> #include <QFileDialog> -#include <Qt3DStudioRuntime2/q3dsutils.h> -#include <Qt3DStudioRuntime2/q3dsengine.h> -#include <Qt3DStudioRuntime2/q3dswindow.h> +#include <Q3DSEngine> +#include <Q3DSWindow> +#include <private/q3dsutils_p.h> int main(int argc, char *argv[]) { diff --git a/tools/qt3dsexplorer/qt3dsexplorer.pro b/tools/qt3dsexplorer/qt3dsexplorer.pro index 0f05de1..c46aa39 100644 --- a/tools/qt3dsexplorer/qt3dsexplorer.pro +++ b/tools/qt3dsexplorer/qt3dsexplorer.pro @@ -1,4 +1,4 @@ -QT += core gui widgets 3dstudioruntime2 +QT += core gui widgets 3dstudioruntime2-private TARGET = qt3dsexplorer |