aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2014-08-28 16:51:00 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-08-28 16:52:02 +0200
commite64b6245a91a9d2bd269452c772c7c6eea784b39 (patch)
tree7991c4cbfc7a0b702fef6b8a3e9cb362a2b9ce8b /tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
parent26fb6a0915ec64d30eaa78e781e7f18468bc2ed7 (diff)
Add new property "designersupported" to qmldir
This patch adds a property called "designersupported" to qmldir. This allows the Qt Quick Designer to only load plugins that have the line ""designersupported"" in their qmldir file. So the designer can load sub components without risking to load plugins that have never been tested in the designer and that might crash. The check for "designersupported"" is activated by using QQmlImports::setDesignerSupportRequired(). Change-Id: I4bf07cc163faa47996eacb1365a7961c51c51060 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlimport/tst_qqmlimport.cpp')
-rw-r--r--tests/auto/qml/qqmlimport/tst_qqmlimport.cpp100
1 files changed, 100 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
new file mode 100644
index 0000000000..bd29b8f18b
--- /dev/null
+++ b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/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 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 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 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QQmlApplicationEngine>
+#include <QtQuick/qquickview.h>
+#include <QtQuick/qquickitem.h>
+#include <private/qqmlimport_p.h>
+#include "../../shared/util.h"
+
+class tst_QQmlImport : public QQmlDataTest
+{
+ Q_OBJECT
+
+private slots:
+ void testDesignerSupported();
+ void cleanup();
+};
+
+void tst_QQmlImport::cleanup()
+{
+ QQmlImports::setDesignerSupportRequired(false);
+}
+
+void tst_QQmlImport::testDesignerSupported()
+{
+ QQuickView *window = new QQuickView();
+ window->engine()->addImportPath(QT_TESTCASE_BUILDDIR);
+
+ window->setSource(testFileUrl("testfile_supported.qml"));
+ QVERIFY(window->errors().isEmpty());
+
+ window->setSource(testFileUrl("testfile_unsupported.qml"));
+ QVERIFY(window->errors().isEmpty());
+
+ QQmlImports::setDesignerSupportRequired(true);
+
+ //imports are cached so we create a new window
+ delete window;
+ window = new QQuickView();
+
+ window->engine()->addImportPath(QT_TESTCASE_BUILDDIR);
+ window->engine()->clearComponentCache();
+
+ window->setSource(testFileUrl("testfile_supported.qml"));
+ QVERIFY(window->errors().isEmpty());
+
+ QString warningString("%1:43:1: module does not support the designer \"MyPluginUnsupported\" \n import MyPluginUnsupported 1.0\r \n ^ ");
+#ifndef Q_OS_WIN
+ warningString.remove('\r');
+#endif
+ warningString = warningString.arg(testFileUrl("testfile_unsupported.qml").toString());
+ QTest::ignoreMessage(QtWarningMsg, warningString.toAscii());
+ window->setSource(testFileUrl("testfile_unsupported.qml"));
+ QVERIFY(!window->errors().isEmpty());
+
+ delete window;
+}
+
+QTEST_MAIN(tst_QQmlImport)
+
+#include "tst_qqmlimport.moc"