Fix QQuickDayOfWeekModel::setLocale()
It must emit dataChanged() even if the first day of week of the new and old locales are the same. The names are most likely different. Change-Id: I932215821962910ef1fb8a66f2dab81dcc51a3b1 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
This commit is contained in:
parent
8f1d88448b
commit
7d0ab32ffb
|
@ -14,6 +14,7 @@
|
||||||
/tests/auto/accessibility/tst_accessibility
|
/tests/auto/accessibility/tst_accessibility
|
||||||
/tests/auto/activeFocusOnTab/tst_activeFocusOnTab
|
/tests/auto/activeFocusOnTab/tst_activeFocusOnTab
|
||||||
/tests/auto/applicationwindow/tst_applicationwindow
|
/tests/auto/applicationwindow/tst_applicationwindow
|
||||||
|
/tests/auto/calendar/tst_calendar
|
||||||
/tests/auto/controls/tst_controls
|
/tests/auto/controls/tst_controls
|
||||||
/tests/auto/sanity/tst_sanity
|
/tests/auto/sanity/tst_sanity
|
||||||
/tests/auto/snippets/tst_snippets
|
/tests/auto/snippets/tst_snippets
|
||||||
|
|
|
@ -63,10 +63,8 @@ void QQuickDayOfWeekModel::setLocale(const QLocale &locale)
|
||||||
{
|
{
|
||||||
Q_D(QQuickDayOfWeekModel);
|
Q_D(QQuickDayOfWeekModel);
|
||||||
if (d->locale != locale) {
|
if (d->locale != locale) {
|
||||||
bool changed = d->locale.firstDayOfWeek() != locale.firstDayOfWeek();
|
|
||||||
d->locale = locale;
|
d->locale = locale;
|
||||||
emit localeChanged();
|
emit localeChanged();
|
||||||
if (changed)
|
|
||||||
emit dataChanged(index(0, 0), index(6, 0));
|
emit dataChanged(index(0, 0), index(6, 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ SUBDIRS += \
|
||||||
accessibility \
|
accessibility \
|
||||||
activeFocusOnTab \
|
activeFocusOnTab \
|
||||||
applicationwindow \
|
applicationwindow \
|
||||||
|
calendar \
|
||||||
controls \
|
controls \
|
||||||
sanity \
|
sanity \
|
||||||
snippets
|
snippets
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
TEMPLATE = app
|
||||||
|
TARGET = tst_calendar
|
||||||
|
CONFIG += qmltestcase
|
||||||
|
|
||||||
|
SOURCES += \
|
||||||
|
$$PWD/tst_calendar.cpp
|
||||||
|
|
||||||
|
OTHER_FILES += \
|
||||||
|
$$PWD/data/*
|
||||||
|
|
||||||
|
TESTDATA += \
|
||||||
|
$$PWD/data/tst_*
|
|
@ -0,0 +1,74 @@
|
||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2015 The Qt Company Ltd.
|
||||||
|
** Contact: http://www.qt.io/licensing/
|
||||||
|
**
|
||||||
|
** This file is part of the test suite of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:BSD$
|
||||||
|
** 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.2
|
||||||
|
import QtTest 1.0
|
||||||
|
import QtQuick.Calendar 2.0
|
||||||
|
|
||||||
|
TestCase {
|
||||||
|
id: testCase
|
||||||
|
width: 400
|
||||||
|
height: 400
|
||||||
|
visible: true
|
||||||
|
when: windowShown
|
||||||
|
name: "DayOfWeekRow"
|
||||||
|
|
||||||
|
Component {
|
||||||
|
id: component
|
||||||
|
DayOfWeekRow { }
|
||||||
|
}
|
||||||
|
|
||||||
|
function test_locale() {
|
||||||
|
var control = component.createObject(testCase)
|
||||||
|
|
||||||
|
verify(control.contentItem.children[0])
|
||||||
|
|
||||||
|
control.locale = Qt.locale("en_US")
|
||||||
|
compare(control.contentItem.children[0].text, "Sun")
|
||||||
|
|
||||||
|
control.locale = Qt.locale("no_NO")
|
||||||
|
compare(control.contentItem.children[0].text, "ma.")
|
||||||
|
|
||||||
|
control.locale = Qt.locale("fi_FI")
|
||||||
|
compare(control.contentItem.children[0].text, "ma")
|
||||||
|
|
||||||
|
control.destroy()
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,38 @@
|
||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2015 The Qt Company Ltd.
|
||||||
|
** Contact: http://www.qt.io/licensing/
|
||||||
|
**
|
||||||
|
** This file is part of the test suite of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:LGPL3$
|
||||||
|
** 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 http://www.qt.io/terms-conditions. For further
|
||||||
|
** information use the contact form at http://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
** General Public License version 3 as published by the Free Software
|
||||||
|
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
|
||||||
|
** packaging of this file. Please review the following information to
|
||||||
|
** ensure the GNU Lesser General Public License version 3 requirements
|
||||||
|
** will be met: https://www.gnu.org/licenses/lgpl.html.
|
||||||
|
**
|
||||||
|
** GNU General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU
|
||||||
|
** General Public License version 2.0 or later as published by the Free
|
||||||
|
** Software Foundation and appearing in the file LICENSE.GPL included in
|
||||||
|
** the packaging of this file. Please review the following information to
|
||||||
|
** ensure the GNU General Public License version 2.0 requirements will be
|
||||||
|
** met: http://www.gnu.org/licenses/gpl-2.0.html.
|
||||||
|
**
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include <QtQuickTest/quicktest.h>
|
||||||
|
QUICK_TEST_MAIN(tst_calendar)
|
Loading…
Reference in New Issue