diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-01-23 09:53:59 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-01-23 09:00:12 +0000 |
| commit | 395502155f084b9937b12b5dec4e6f2d16da1e3e (patch) | |
| tree | f37f00c523a301d2dae08c38e6becca38cbc7d92 | |
| parent | ebd273344998523a9fc44be8b08fbd5c4980781b (diff) | |
Fix missing initial color from Color Dialog
Task-number: QT3DS-2923
Change-Id: Ia5eb0518fd69745697df1778c9504c250fb87931
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Authoring/Studio/UI/StudioAppPrefsPage.cpp | 1 | ||||
| -rw-r--r-- | src/Authoring/Studio/Workspace/Dialogs.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp b/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp index bfea1bac..988201df 100644 --- a/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp +++ b/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp @@ -43,7 +43,6 @@ #include "Core.h" #include "IStudioRenderer.h" -#include <QtWidgets/qcolordialog.h> #include <QtWidgets/qmessagebox.h> #include <QtGui/qstandarditemmodel.h> #include <QtCore/qdiriterator.h> diff --git a/src/Authoring/Studio/Workspace/Dialogs.cpp b/src/Authoring/Studio/Workspace/Dialogs.cpp index 39fe8b79..38e19671 100644 --- a/src/Authoring/Studio/Workspace/Dialogs.cpp +++ b/src/Authoring/Studio/Workspace/Dialogs.cpp @@ -1549,8 +1549,8 @@ QStringList CDialogs::qmlStreamExtensions() QColor CDialogs::displayColorDialog(const QColor &color) const { QColorDialog theColorDlg; - theColorDlg.setCurrentColor(color); theColorDlg.setOption(QColorDialog::DontUseNativeDialog, true); + theColorDlg.setCurrentColor(color); connect(&theColorDlg, &QColorDialog::currentColorChanged, this, &CDialogs::onColorChanged); int result = theColorDlg.exec(); disconnect(&theColorDlg, &QColorDialog::currentColorChanged, this, &CDialogs::onColorChanged); |