diff options
Diffstat (limited to 'src/imports/controls/material')
5 files changed, 6 insertions, 5 deletions
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro index 63450289..2f62a195 100644 --- a/src/imports/controls/material/material.pro +++ b/src/imports/controls/material/material.pro @@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/controls/material IMPORT_VERSION = 1.0 QT += qml quick -QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private labscontrols-private +QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 4788001f..e73aaef5 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -39,7 +39,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qsettings.h> #include <QtQml/qqmlinfo.h> -#include <QtLabsControls/private/qquickstyleattached_p.h> +#include <QtQuickControls/private/qquickstyleattached_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index 2bf2915e..aa8aa9f4 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -49,7 +49,7 @@ // #include <QtGui/qcolor.h> -#include <QtLabsControls/private/qquickstyleattached_p.h> +#include <QtQuickControls/private/qquickstyleattached_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h index af899c6f..9fd74bcc 100644 --- a/src/imports/controls/material/qquickmaterialtheme_p.h +++ b/src/imports/controls/material/qquickmaterialtheme_p.h @@ -50,7 +50,7 @@ #include <QtGui/qpa/qplatformtheme.h> #include <QtGui/qfont.h> -#include <QtLabsControls/private/qquickproxytheme_p.h> +#include <QtQuickControls/private/qquickproxytheme_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp index 95e09225..a42424ea 100644 --- a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp +++ b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp @@ -42,7 +42,8 @@ #include "qquickmaterialprogressstrip_p.h" #include <QtGui/private/qguiapplication_p.h> -#include <QtLabsControls/qquickstyle.h> +#include <QtQuickControls/qquickstyle.h> +#include <QtQuickControls/private/qquickstyleselector_p.h> static inline void initResources() { |