diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /examples/widgets/widgets/stylesheet | |
parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'examples/widgets/widgets/stylesheet')
4 files changed, 7 insertions, 5 deletions
diff --git a/examples/widgets/widgets/stylesheet/main.cpp b/examples/widgets/widgets/stylesheet/main.cpp index 1874bceb8c..3b1168398a 100644 --- a/examples/widgets/widgets/stylesheet/main.cpp +++ b/examples/widgets/widgets/stylesheet/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtWidgets> +#include <QApplication> #include "mainwindow.h" diff --git a/examples/widgets/widgets/stylesheet/mainwindow.cpp b/examples/widgets/widgets/stylesheet/mainwindow.cpp index f187c007dd..a8bd20e964 100644 --- a/examples/widgets/widgets/stylesheet/mainwindow.cpp +++ b/examples/widgets/widgets/stylesheet/mainwindow.cpp @@ -48,11 +48,11 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "mainwindow.h" #include "stylesheeteditor.h" +#include <QMessageBox> + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { diff --git a/examples/widgets/widgets/stylesheet/mainwindow.h b/examples/widgets/widgets/stylesheet/mainwindow.h index 8af4c01da0..ba979a3881 100644 --- a/examples/widgets/widgets/stylesheet/mainwindow.h +++ b/examples/widgets/widgets/stylesheet/mainwindow.h @@ -51,7 +51,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QtWidgets> +#include <QMainWindow> #include "ui_mainwindow.h" diff --git a/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp b/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp index 0874cc3554..2cc0e969e2 100644 --- a/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp +++ b/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp @@ -50,7 +50,9 @@ #include "stylesheeteditor.h" -#include <QtWidgets> +#include <QFile> +#include <QRegularExpression> +#include <QStyleFactory> StyleSheetEditor::StyleSheetEditor(QWidget *parent) : QDialog(parent) |