Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions buildscripts/pch/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ See https://github.com/musescore/musescore_devtools/tree/main/include-what-you-u
#include <QFont> //30

// QtQml includes
#include <QQmlEngine> //26+62(qqml.h)
#include <QJSValue> //41
#include <QtQml/QQmlEngine> //26+62(qqml.h)
#include <QtQml/QJSValue> //41
#include <QQmlListProperty> //30

// QtQuick includes
#include <QQuickItem> //106
#include <QtQuick/QQuickItem> //106

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is quite unexpected that QtQuick/ is necessary here; especially given that it is apparently not necessary at for example <QQmlListProperty>. Do you have any explanation for that?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't compile otherwise, on Gentoo ~amd64, with Qt 6.11.2.

Here's the output of `rg -i 'include.*qquickitem>' /usr/include/qt6/`:
/usr/include/qt6/QtQuickParticles/6.11.2/QtQuickParticles/private/qquickparticlesystem_p.h
18:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuickTestUtils/6.11.2/QtQuickTestUtils/private/viewtestutils_p.h
20:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuickParticles/6.11.2/QtQuickParticles/private/qquickparticleemitter_p.h
18:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuick/qquicktextdocument.h
9:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuickLayouts/6.11.2/QtQuickLayouts/private/qquicklayout_p.h
20:#include <QQuickItem>

/usr/include/qt6/QtQuick3D/6.11.2/QtQuick3D/private/qquick3dtexture_p.h
24:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtChartsQml/6.11.2/QtChartsQml/private/declarativepolarchart_p.h
18:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtChartsQml/6.11.2/QtChartsQml/private/declarativepieseries_p.h
21:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtChartsQml/6.11.2/QtChartsQml/private/declarativeboxplotseries_p.h
22:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtChartsQml/6.11.2/QtChartsQml/private/declarativechart_p.h
22:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtChartsQml/6.11.2/QtChartsQml/private/declarativecandlestickseries_p.h
21:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtChartsQml/6.11.2/QtChartsQml/private/declarativebarseries_p.h
27:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuick/qquickframebufferobject.h
8:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuick/qquickrhiitem.h
8:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuick3D/6.11.2/QtQuick3D/private/qquick3dviewport_p.h
20:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuick/6.11.2/QtQuick/private/qquickanimatedsprite_p.h
23:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuick/6.11.2/QtQuick/private/qaccessiblequickitem_p.h
19:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuick/6.11.2/QtQuick/private/qquickspritesequence_p.h
23:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtPdfQuick/6.11.2/QtPdfQuick/private/qquickpdfselection_p.h
25:#include <QtQuick/QQuickItem>

/usr/include/qt6/QtQuickVectorImage/6.11.2/QtQuickVectorImage/private/qquickvectorimage_p.h
18:#include <QQuickItem>

/usr/include/qt6/QtQuickControls2Impl/6.11.2/QtQuickControls2Impl/private/qquicktumblerview_p.h
19:#include <QQuickItem>

/usr/include/qt6/QtQuickVectorImageGenerator/6.11.2/QtQuickVectorImageGenerator/private/qquicknodeinfo_p.h
22:#include <QQuickItem>

/usr/include/qt6/QtQuickEffects/6.11.2/QtQuickEffects/private/qgfxsourceproxy_p.h
19:#include <QtQuick/QQuickItem>


#endif // NO_QT_SUPPORT
2 changes: 1 addition & 1 deletion framework/accessibility/internal/accessiblestub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
#include "accessiblestub.h"

#include <QQuickItem>
#include <QtQuick/QQuickItem>

using namespace muse::accessibility;

Expand Down
2 changes: 1 addition & 1 deletion framework/cloud/qml/Muse/Cloud/cloudsmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <QAbstractListModel>
#include <QVariant>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "modularity/ioc.h"
#include "async/asyncable.h"
Expand Down
2 changes: 1 addition & 1 deletion framework/cloud/qml/Muse/Cloud/enums.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#pragma once

#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "cloud/cloudtypes.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#pragma once

#include <QObject>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "modularity/ioc.h"
#include "async/asyncable.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#pragma once

#include <QAbstractListModel>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "modularity/ioc.h"
#include "actions/iactionsdispatcher.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#pragma once

#include <QObject>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

namespace muse::diagnostics {
class CrashHandlerDevToolsModel : public QObject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <QAbstractItemModel>
#include <QHash>
#include <QTimer>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "modularity/ioc.h"
#include "accessibility/iaccessibilitycontroller.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#pragma once

#include <QAbstractListModel>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "modularity/ioc.h"
#include "idiagnosticspathsregister.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <QObject>
#include <QVariant>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "ui/inavigation.h"
#include "async/asyncable.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <QObject>
#include <QTimer>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "modularity/ioc.h"
#include "ui/inavigationcontroller.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#pragma once

#include <QObject>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "abstractkeynavdevitem.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#pragma once

#include <QObject>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "modularity/ioc.h"
#include "ui/iuiengine.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#pragma once

#include <QAbstractListModel>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

namespace muse::diagnostics {
class ProfilerViewModel : public QAbstractListModel
Expand Down
2 changes: 1 addition & 1 deletion framework/dockwindow/docktypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <QVariant>
#include <QRect>

#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

namespace muse::dock {
constexpr const char* CONTEXT_MENU_MODEL_PROPERTY("contextMenuModel");
Expand Down
2 changes: 1 addition & 1 deletion framework/dockwindow/idockwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef MUSE_DOCK_IDOCKWINDOW_H
#define MUSE_DOCK_IDOCKWINDOW_H

#include <QQuickItem>
#include <QtQuick/QQuickItem>
#include <QString>

#include "async/channel.h"
Expand Down
4 changes: 2 additions & 2 deletions framework/dockwindow/internal/dockbase.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

#pragma once

#include <QQuickItem>
#include <qqmlintegration.h>
#include <QtQuick/QQuickItem>
#include <QtQmlIntegration/qqmlintegration.h>

#include "global/modularity/ioc.h"

Expand Down
2 changes: 1 addition & 1 deletion framework/dockwindow/internal/dockseparator.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifndef MUSE_DOCK_DOCKSEPARATOR_H
#define MUSE_DOCK_DOCKSEPARATOR_H

#include <QQuickItem>
#include <QtQuick/QQuickItem>

#include "thirdparty/KDDockWidgets/src/private/multisplitter/Separator_p.h"
#include "thirdparty/KDDockWidgets/src/private/multisplitter/Widget_quick.h"
Expand Down
2 changes: 1 addition & 1 deletion framework/dockwindow/internal/docktabbar.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifndef MUSE_DOCK_DOCKTABBAR_H
#define MUSE_DOCK_DOCKTABBAR_H

#include <QQuickItem>
#include <QtQuick/QQuickItem>

#include "thirdparty/KDDockWidgets/src/private/quick/TabBarQuick_p.h"

Expand Down
2 changes: 1 addition & 1 deletion framework/dockwindow/qml/Muse/Dock/dockframemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "dockframemodel.h"

#include <QQuickItem>
#include <QtQuick/QQuickItem>
#include <QApplication>

#include "private/TitleBar_p.h"
Expand Down
4 changes: 2 additions & 2 deletions framework/dockwindow/qml/Muse/Dock/dockframemodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#pragma once

#include <QPointer>
#include <QQuickItem>
#include <qqmlintegration.h>
#include <QtQuick/QQuickItem>
#include <QtQmlIntegration/qqmlintegration.h>

#include "modularity/ioc.h"
#include "actions/iactionsdispatcher.h"
Expand Down
4 changes: 2 additions & 2 deletions framework/dockwindow/qml/Muse/Dock/dockpageview.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

#pragma once

#include <QQuickItem>
#include <qqmlintegration.h>
#include <QtQuick/QQuickItem>
#include <QtQmlIntegration/qqmlintegration.h>

#include "uicomponents/qml/Muse/UiComponents/qmllistproperty.h"

Expand Down
2 changes: 1 addition & 1 deletion framework/dockwindow/qml/Muse/Dock/docktabsmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <QAbstractListModel>
#include <QObject>
#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "thirdparty/KDDockWidgets/src/DockWidgetBase.h"

Expand Down
4 changes: 2 additions & 2 deletions framework/dockwindow/qml/Muse/Dock/dockwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

#pragma once

#include <QQuickItem>
#include <qqmlintegration.h>
#include <QtQuick/QQuickItem>
#include <QtQmlIntegration/qqmlintegration.h>

#include "async/asyncable.h"
#include "uicomponents/qml/Muse/UiComponents/qmllistproperty.h"
Expand Down
2 changes: 1 addition & 1 deletion framework/dockwindow/qml/Muse/Dock/foreign.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#pragma once

#include <qqmlintegration.h>
#include <QtQmlIntegration/qqmlintegration.h>

#include "internal/dockbase.h" // IWYU pragma: keep
#include "docktypes.h" // IWYU pragma: keep
Expand Down
4 changes: 2 additions & 2 deletions framework/dockwindow/thirdparty/KDDockWidgets/src/Config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

#ifdef KDDOCKWIDGETS_QTQUICK
#include "private/quick/Helpers_p.h"
#include <QQmlEngine>
#include <QQmlContext>
#include <QtQml/QQmlEngine>
#include <QtQml/QQmlContext>
#endif

#include "ContextData.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "private/quick/FrameQuick_p.h"

#include <Config.h>
#include <QQuickItem>
#include <QtQuick/QQuickItem>
#include <QCloseEvent>

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#ifdef KDDOCKWIDGETS_QTQUICK
#include "private/quick/TitleBarQuick_p.h"

#include <QQuickItem>
#include <QQuickView>
#include <QtQuick/QQuickItem>
#include <QtQuick/QQuickView>
#include <QGuiApplication>
#else
#include <QApplication>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ Indicator::Indicator(ClassicIndicators *classicIndicators, IndicatorWindow *pare

#else

#include <QQmlContext>
#include <QtQml/QQmlContext>

IndicatorWindow::IndicatorWindow(KDDockWidgets::ClassicIndicators *classicIndicators)
: QQuickView()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class Indicator : public QWidget

#else

#include <QQuickView>
#include <QtQuick/QQuickView>

namespace KDDockWidgets {
class ClassicIndicators;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "Separator_p.h"

#ifdef KDMULTISPLITTER_QTQUICK
#include <QQmlEngine>
#include <QtQml/QQmlEngine>
#endif

namespace Layouting {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "kddockwidgets/docks_export.h"
#include "Widget_quick.h"

#include <QQuickItem>
#include <QtQuick/QQuickItem>

namespace Layouting {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "Separator_p.h"
#include "Widget_quick.h"

#include <QQuickItem>
#include <QtQuick/QQuickItem>

namespace Layouting {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "Widget_quick.h"

#include <QDebug>
#include <QQmlEngine>
#include <QtQml/QQmlEngine>

using namespace Layouting;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "Widget.h"

#include <QQuickItem>
#include <QtQuick/QQuickItem>

QT_BEGIN_NAMESPACE
class QQuickItem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/

#include <QQmlContext>
#include <QtQml/QQmlContext>

#include "DockWidgetInstantiator_p.h"
#include "DockWidgetQuick.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include "DockWidgetQuick.h"

#include <QQmlParserStatus>
#include <QQuickItem>
#include <QtQml/QQmlParserStatus>
#include <QtQuick/QQuickItem>
#include <QString>

#include <optional>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "../DropArea_p.h"
#include "../WidgetResizeHandler_p.h"

#include <QQuickView>
#include <QtQuick/QQuickView>
#include <QDebug>

using namespace KDDockWidgets;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "Helpers_p.h"
#include "QWidgetAdapter.h"

#include <QQuickItem>
#include <QtQuick/QQuickItem>

using namespace KDDockWidgets;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#include "LayoutSaverInstantiator_p.h"

#include <QQmlContext>
#include <QQmlEngine>
#include <QtQml/QQmlContext>
#include <QtQml/QQmlEngine>

using namespace KDDockWidgets;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "LayoutSaver.h"

#include <QObject>
#include <QQmlParserStatus>
#include <QtQml/QQmlParserStatus>

class QQuickItem;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/

#include <QQmlContext>
#include <QtQml/QQmlContext>

#include "MainWindowInstantiator_p.h"
#include "MainWindowQuick_p.h"
Expand Down
Loading