diff options
-rw-r--r-- | src/dialogs/qquickabstractcolordialog.cpp | 4 | ||||
-rw-r--r-- | tests/auto/dialogs/data/ColorDialogCreated.qml | 64 | ||||
-rw-r--r-- | tests/auto/dialogs/tst_dialogs.cpp | 15 |
3 files changed, 82 insertions, 1 deletions
diff --git a/src/dialogs/qquickabstractcolordialog.cpp b/src/dialogs/qquickabstractcolordialog.cpp index a558b12c2..931893f78 100644 --- a/src/dialogs/qquickabstractcolordialog.cpp +++ b/src/dialogs/qquickabstractcolordialog.cpp @@ -100,8 +100,10 @@ void QQuickAbstractColorDialog::setTitle(const QString &t) void QQuickAbstractColorDialog::setColor(QColor arg) { - if (m_dlgHelper) + if (m_dlgHelper) { + m_dlgHelper->setOptions(m_options); m_dlgHelper->setCurrentColor(arg); + } // m_options->setCustomColor or setStandardColor don't make sense here if (m_color != arg) { m_color = arg; diff --git a/tests/auto/dialogs/data/ColorDialogCreated.qml b/tests/auto/dialogs/data/ColorDialogCreated.qml new file mode 100644 index 000000000..508c28eb4 --- /dev/null +++ b/tests/auto/dialogs/data/ColorDialogCreated.qml @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Dialogs 1.0 + +Rectangle { + width: 1024 + height: 320 + property string col: "#FF0000" + ColorDialog { + id: markerColorDialogId + visible: false + color: col + objectName: "colorDialog" + } +} diff --git a/tests/auto/dialogs/tst_dialogs.cpp b/tests/auto/dialogs/tst_dialogs.cpp index a9c9b5e65..bf53f89a0 100644 --- a/tests/auto/dialogs/tst_dialogs.cpp +++ b/tests/auto/dialogs/tst_dialogs.cpp @@ -63,6 +63,9 @@ private slots: void fileDialogNameFilters(); void fileDialogDefaultSuffix(); + // ColorDialog + void colorDialogCreated(); + private: }; @@ -386,6 +389,18 @@ void tst_dialogs::dialogWithDynamicTitle() QTRY_COMPARE(window->title(), QLatin1String("New Title")); } +void tst_dialogs::colorDialogCreated() +{ + // Test to ensure it is not crashing when color is assigned + // on startup + QQmlEngine engine; + QQmlComponent component(&engine); + component.loadUrl(testFileUrl("ColorDialogCreated.qml")); + QScopedPointer<QObject> cleanup(component.create()); + QObject *colorDlg = cleanup->findChild<QObject *>("colorDialog"); + QVERIFY(colorDlg); +} + QTEST_MAIN(tst_dialogs) #include "tst_dialogs.moc" |