aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/platform/qquickplatformcolordialog.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-08-14 13:46:51 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-08-14 12:07:27 +0000
commit54de8921d0fb10ee6d554f13631d57b2f7bfdffe (patch)
tree2b6c000834850714f05fd7ca775c909276da1d77 /src/imports/platform/qquickplatformcolordialog.cpp
parent018e051c266413e514f93bcd24a0c783554cfea7 (diff)
Platform dialogs: make properties independent of the platform instance
This allows us to postpone to creation further, and even re-create the instance on the fly later, without losing information. Change-Id: I116d332d10d637bbc393ee31ec1bc8b0cd156835 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/platform/qquickplatformcolordialog.cpp')
-rw-r--r--src/imports/platform/qquickplatformcolordialog.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/imports/platform/qquickplatformcolordialog.cpp
index 5f5905d4..ed6b9a56 100644
--- a/src/imports/platform/qquickplatformcolordialog.cpp
+++ b/src/imports/platform/qquickplatformcolordialog.cpp
@@ -145,13 +145,14 @@ QColor QQuickPlatformColorDialog::currentColor() const
{
if (QPlatformColorDialogHelper *colorDialog = qobject_cast<QPlatformColorDialogHelper *>(handle()))
return colorDialog->currentColor();
- return QColor();
+ return m_currentColor;
}
void QQuickPlatformColorDialog::setCurrentColor(const QColor &color)
{
if (QPlatformColorDialogHelper *colorDialog = qobject_cast<QPlatformColorDialogHelper *>(handle()))
colorDialog->setCurrentColor(color);
+ m_currentColor = color;
}
/*!