diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:56 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:56 +0200 |
commit | 5b6a81d8349c2cdff7787de7aaa396722bc60420 (patch) | |
tree | 7f92649cd19f775c8e91c53f84d131d94a6ae470 | |
parent | f281054d12b53b95df3926e54ac6a99ecf9bc3ca (diff) | |
parent | 91394cccb942df1b5699b0d9d69de9ecc6ced86a (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I436c6ecbac500eb2b7836c7b29756972ee9e14df
9 files changed, 4 insertions, 208 deletions
diff --git a/src/plugins/qdeclarativeview/qdeclarativeview.pro b/src/plugins/qdeclarativeview/qdeclarativeview.pro index 8c3559c3..2c8fb918 100644 --- a/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,5 +1,5 @@ TARGET = qdeclarativeview -QT += declarative widgets designer +QT += declarative widgets uiplugin PLUGIN_TYPE = designer PLUGIN_CLASS_NAME = QDeclarativeViewPlugin diff --git a/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h b/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h index 5af85879..82e2b36b 100644 --- a/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h +++ b/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h @@ -34,7 +34,7 @@ #ifndef QDECLARATIVEVIEW_PLUGIN_H #define QDECLARATIVEVIEW_PLUGIN_H -#include <QtDesigner/QDesignerCustomWidgetInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> QT_BEGIN_NAMESPACE diff --git a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro index cf38fa78..2dc69d7d 100644 --- a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro +++ b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro @@ -1,5 +1,6 @@ TEMPLATE = app +CONFIG += testcase TARGET = tst_qdeclarativewebview SOURCES += $${TARGET}.cpp diff --git a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp index 51bf3859..d2b53dba 100644 --- a/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp +++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp @@ -278,6 +278,7 @@ void tst_QDeclarativeWebView::multipleWindows() QDeclarativeProperty prop(rootItem, "firstPageOpened"); QObject* firstPageOpened = qvariant_cast<QObject*>(prop.read()); + QEXPECT_FAIL("", "Test is known to fail.", Abort); QVERIFY(firstPageOpened); QDeclarativeProperty xProp(firstPageOpened, "x"); diff --git a/tools/designer/src/plugins/plugins.pri b/tools/designer/src/plugins/plugins.pri deleted file mode 100644 index 330a2e7f..00000000 --- a/tools/designer/src/plugins/plugins.pri +++ /dev/null @@ -1,5 +0,0 @@ -QT += designer declarative - -PLUGIN_TYPE = designer -CONFIG += tool_plugin -load(qt_plugin) diff --git a/tools/designer/src/plugins/plugins.pro b/tools/designer/src/plugins/plugins.pro deleted file mode 100644 index f08a74e5..00000000 --- a/tools/designer/src/plugins/plugins.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs -CONFIG += ordered - -REQUIRES = !CONFIG(static,shared|static) -SUBDIRS += qdeclarativeview diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro deleted file mode 100644 index c179e47c..00000000 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = qdeclarativeview - -PLUGIN_CLASS_NAME = QDeclarativeViewPlugin -include(../plugins.pri) - -SOURCES += qdeclarativeview_plugin.cpp -HEADERS += qdeclarativeview_plugin.h diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp deleted file mode 100644 index fd534226..00000000 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp +++ /dev/null @@ -1,122 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Designer 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 "qdeclarativeview_plugin.h" - -#include <QtDesigner/QExtensionFactory> -#include <QtDesigner/QExtensionManager> - -#include <QtCore/qplugin.h> -#include <QtDeclarative/QDeclarativeView> - -static const char toolTipC[] = "QtDeclarative view widget"; - -QT_BEGIN_NAMESPACE - -QDeclarativeViewPlugin::QDeclarativeViewPlugin(QObject *parent) : - QObject(parent), - m_initialized(false) -{ -} - -QString QDeclarativeViewPlugin::name() const -{ - return QLatin1String("QDeclarativeView"); -} - -QString QDeclarativeViewPlugin::group() const -{ - return QLatin1String("Display Widgets"); -} - -QString QDeclarativeViewPlugin::toolTip() const -{ - return tr(toolTipC); -} - -QString QDeclarativeViewPlugin::whatsThis() const -{ - return tr(toolTipC); -} - -QString QDeclarativeViewPlugin::includeFile() const -{ - return QLatin1String("QtDeclarative/QDeclarativeView"); -} - -QIcon QDeclarativeViewPlugin::icon() const -{ - return QIcon(); -} - -bool QDeclarativeViewPlugin::isContainer() const -{ - return false; -} - -QWidget *QDeclarativeViewPlugin::createWidget(QWidget *parent) -{ - return new QDeclarativeView(parent); -} - -bool QDeclarativeViewPlugin::isInitialized() const -{ - return m_initialized; -} - -void QDeclarativeViewPlugin::initialize(QDesignerFormEditorInterface * /*core*/) -{ - if (m_initialized) - return; - - m_initialized = true; -} - -QString QDeclarativeViewPlugin::domXml() const -{ - return QLatin1String("\ - <ui language=\"c++\">\ - <widget class=\"QDeclarativeView\" name=\"declarativeView\">\ - <property name=\"geometry\">\ - <rect>\ - <x>0</x>\ - <y>0</y>\ - <width>300</width>\ - <height>200</height>\ - </rect>\ - </property>\ - </widget>\ - </ui>"); -} - -QT_END_NAMESPACE diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h deleted file mode 100644 index 2d5d2d89..00000000 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Designer 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$ -** -****************************************************************************/ - -#ifndef QDECLARATIVEVIEW_PLUGIN_H -#define QDECLARATIVEVIEW_PLUGIN_H - -#include <QtDesigner/QDesignerCustomWidgetInterface> - -QT_BEGIN_NAMESPACE - -class QDeclarativeViewPlugin: public QObject, public QDesignerCustomWidgetInterface -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.QDesignerCustomWidgetInterface") - Q_INTERFACES(QDesignerCustomWidgetInterface) -public: - QDeclarativeViewPlugin(QObject *parent = 0); - - virtual QString name() const; - virtual QString group() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; - virtual QString includeFile() const; - virtual QIcon icon() const; - virtual bool isContainer() const; - virtual QWidget *createWidget(QWidget *parent); - virtual bool isInitialized() const; - virtual void initialize(QDesignerFormEditorInterface *core); - virtual QString domXml() const; - -private: - bool m_initialized; -}; - -QT_END_NAMESPACE - -#endif // QDECLARATIVEVIEW_PLUGIN_H |