diff options
author | Christian Stenger <christian.stenger@qt.io> | 2022-04-07 21:56:10 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2022-04-08 04:57:00 +0000 |
commit | d0e854e3908c3845d28536a5c8c7436b355a15f7 (patch) | |
tree | 851a2652d6cd7734c1c00fc0e582d33799b12126 | |
parent | 42b60e3ec927c5141754a3c8345ddfee7770c2f0 (diff) | |
download | qt-creator-d0e854e3908c3845d28536a5c8c7436b355a15f7.tar.gz |
QmlJSTools: Fix compile with Qbs
Amends 87e52ad189291. While at it reorder includes to
match QC style.
Change-Id: I8bbfdd4db9409a7348e7a2cbcb954972a2a2f9b4
Reviewed-by: David Schulz <david.schulz@qt.io>
8 files changed, 29 insertions, 17 deletions
diff --git a/src/plugins/qmljstools/qmljscodestylepreferences.h b/src/plugins/qmljstools/qmljscodestylepreferences.h index 2c3d2e5d51..3f3b75475d 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferences.h +++ b/src/plugins/qmljstools/qmljscodestylepreferences.h @@ -26,6 +26,7 @@ #pragma once #include "qmljstools_global.h" + #include "qmljscodestylesettings.h" #include <texteditor/icodestylepreferences.h> diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp index f054a37bd4..5dbfd1ca96 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp +++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp @@ -24,11 +24,12 @@ ****************************************************************************/ #include "qmljscodestylepreferencesfactory.h" + +#include "qmljscodestylepreferences.h" #include "qmljscodestylesettingspage.h" -#include "qmljstoolsconstants.h" #include "qmljsindenter.h" +#include "qmljstoolsconstants.h" -#include <qmljscodestylepreferences.h> #include <qmljseditor/qmljseditorconstants.h> diff --git a/src/plugins/qmljstools/qmljscodestylepreferenceswidget.cpp b/src/plugins/qmljstools/qmljscodestylepreferenceswidget.cpp index 656cdba06d..c7fac08af6 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferenceswidget.cpp +++ b/src/plugins/qmljstools/qmljscodestylepreferenceswidget.cpp @@ -24,12 +24,13 @@ ****************************************************************************/ #include "qmljscodestylepreferenceswidget.h" + #include "qmljscodestylepreferences.h" -#include "qmljscodestylesettingswidget.h" #include "qmljscodestylesettings.h" +#include "qmljscodestylesettingswidget.h" -#include <QVBoxLayout> #include <QLabel> +#include <QVBoxLayout> namespace QmlJSTools { diff --git a/src/plugins/qmljstools/qmljscodestylepreferenceswidget.h b/src/plugins/qmljstools/qmljscodestylepreferenceswidget.h index dd3ae21e80..12861bda5e 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferenceswidget.h +++ b/src/plugins/qmljstools/qmljscodestylepreferenceswidget.h @@ -38,8 +38,6 @@ class QmlJSCodeStyleSettings; class QmlJSCodeStyleSettingsWidget; class QmlJSCodeStylePreferences; -namespace Ui { class TabPreferencesWidget; } - class QMLJSTOOLS_EXPORT QmlJSCodeStylePreferencesWidget : public QWidget { Q_OBJECT diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index a44ecf229d..9113d0f559 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -24,22 +24,23 @@ ****************************************************************************/ #include "qmljscodestylesettingspage.h" -#include "ui_qmljscodestylesettingspage.h" -#include "qmljstoolsconstants.h" -#include "qmljstoolssettings.h" + +#include "qmljscodestylepreferences.h" #include "qmljsindenter.h" #include "qmljsqtstylecodeformatter.h" -#include "qmljscodestylepreferences.h" +#include "qmljstoolsconstants.h" +#include "qmljstoolssettings.h" +#include "ui_qmljscodestylesettingspage.h" +#include <coreplugin/icore.h> +#include <extensionsystem/pluginmanager.h> +#include <qmljseditor/qmljseditorconstants.h> +#include <texteditor/codestyleeditor.h> +#include <texteditor/displaysettings.h> #include <texteditor/fontsettings.h> #include <texteditor/snippets/snippetprovider.h> #include <texteditor/tabsettings.h> -#include <texteditor/displaysettings.h> #include <texteditor/texteditorsettings.h> -#include <texteditor/codestyleeditor.h> -#include <extensionsystem/pluginmanager.h> -#include <qmljseditor/qmljseditorconstants.h> -#include <coreplugin/icore.h> #include <QTextStream> diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.ui b/src/plugins/qmljstools/qmljscodestylesettingspage.ui index 90262704ef..acb034c71f 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.ui +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.ui @@ -80,7 +80,7 @@ Rectangle { <customwidget> <class>QmlJSTools::QmlJSCodeStylePreferencesWidget</class> <extends>QWidget</extends> - <header location="global">qmljscodestylepreferenceswidget.h</header> + <header location="global">qmljstools/qmljscodestylepreferenceswidget.h</header> <container>1</container> </customwidget> </customwidgets> diff --git a/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp b/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp index 1dfbfc324f..7cb7eb2dc5 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingswidget.cpp @@ -24,8 +24,9 @@ ****************************************************************************/ #include "qmljscodestylesettingswidget.h" -#include "ui_qmljscodestylesettingswidget.h" + #include "qmljscodestylesettings.h" +#include "ui_qmljscodestylesettingswidget.h" #include <QTextStream> diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs index 96c0b359b2..b619d9aead 100644 --- a/src/plugins/qmljstools/qmljstools.qbs +++ b/src/plugins/qmljstools/qmljstools.qbs @@ -19,11 +19,20 @@ QtcPlugin { files: [ "qmljsbundleprovider.cpp", "qmljsbundleprovider.h", + "qmljscodestylepreferences.cpp", + "qmljscodestylepreferences.h", "qmljscodestylepreferencesfactory.cpp", "qmljscodestylepreferencesfactory.h", + "qmljscodestylepreferenceswidget.cpp", + "qmljscodestylepreferenceswidget.h", + "qmljscodestylesettings.cpp", + "qmljscodestylesettings.h", "qmljscodestylesettingspage.cpp", "qmljscodestylesettingspage.h", "qmljscodestylesettingspage.ui", + "qmljscodestylesettingswidget.cpp", + "qmljscodestylesettingswidget.h", + "qmljscodestylesettingswidget.ui", "qmljsfunctionfilter.cpp", "qmljsfunctionfilter.h", "qmljsindenter.cpp", |