aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-06-23 10:28:54 +0200
committerJan Arve Sæther <jan-arve.saether@theqtcompany.com>2015-09-25 11:02:59 +0000
commit0220163ca27c3f97e623591a231473c42b907012 (patch)
tree6cb90dc4ea8821a67aa633f349b4c5fc0e485e34 /tests
parent52fb4685e95e5b44e54d2d0f8ea27dea866c75e9 (diff)
Cleanup fontloader cache when QGuiApplication is destroyed
If this cache is used for a second instance of QGuiApplication then the cache is invalid. Change-Id: I02ca16dc03a1239b0ed50c7bcfbf87880ca8d948 Task-number: QTBUG-40861 Reviewed-by: Tim Blechmann <tim@klingt.org> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/qquickfontloader_static/data/font.ttfbin0 -> 51984 bytes
-rw-r--r--tests/auto/quick/qquickfontloader_static/qquickfontloader_static.pro12
-rw-r--r--tests/auto/quick/qquickfontloader_static/tst_qquickfontloader_static.cpp69
-rw-r--r--tests/auto/quick/quick.pro1
4 files changed, 82 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickfontloader_static/data/font.ttf b/tests/auto/quick/qquickfontloader_static/data/font.ttf
new file mode 100644
index 0000000000..aae50d5035
--- /dev/null
+++ b/tests/auto/quick/qquickfontloader_static/data/font.ttf
Binary files differ
diff --git a/tests/auto/quick/qquickfontloader_static/qquickfontloader_static.pro b/tests/auto/quick/qquickfontloader_static/qquickfontloader_static.pro
new file mode 100644
index 0000000000..f6835c05c0
--- /dev/null
+++ b/tests/auto/quick/qquickfontloader_static/qquickfontloader_static.pro
@@ -0,0 +1,12 @@
+CONFIG += testcase
+TARGET = tst_qquickfontloader_static
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qquickfontloader_static.cpp
+
+include (../../shared/util.pri)
+
+TESTDATA = data/*
+
+QT += core-private gui-private qml-private quick-private network testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickfontloader_static/tst_qquickfontloader_static.cpp b/tests/auto/quick/qquickfontloader_static/tst_qquickfontloader_static.cpp
new file mode 100644
index 0000000000..f7f00172ba
--- /dev/null
+++ b/tests/auto/quick/qquickfontloader_static/tst_qquickfontloader_static.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QGuiApplication>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlComponent>
+#include "../../shared/util.h"
+#include <qtest.h>
+
+QByteArray qmltemplate("import QtQuick 2.0\n"
+"\n"
+"Rectangle {\n"
+" width: 400\n"
+" height: 400\n"
+" color: \"red\"\n"
+" FontLoader { id: fixedFont; source: \"%1\" }\n"
+" Text {\n"
+" text: \"hello world\"\n"
+" anchors.centerIn: parent\n"
+" font.family: fixedFont.name\n"
+" }\n"
+"}\n");
+
+int main(int argc, char **argv)
+{
+ for (int i = 0; i < 3; i++) {
+ QGuiApplication app(argc, argv);
+ QQmlDataTest dataTest;
+ dataTest.initTestCase();
+ QQuickView window;
+ QQmlComponent component (window.engine());
+ QUrl current = QUrl::fromLocalFile("");
+ qmltemplate.replace("%1", dataTest.testFileUrl("font.ttf").toString().toLocal8Bit());
+ component.setData(qmltemplate, current);
+ window.setContent(current, &component, component.create());
+ window.show();
+ QTest::qWaitForWindowActive(&window);
+ }
+}
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 5593fd94f6..f25a28d45b 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -18,6 +18,7 @@ PRIVATETESTS += \
qquickapplication \
qquickbehaviors \
qquickfontloader \
+ qquickfontloader_static \
qquickfontmetrics \
qquickimageprovider \
qquickpath \