From 4442dea01b9d4d45964228ac442166d89f091f9e Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 11 Jul 2011 13:47:51 +1000 Subject: Extract all QtQuick 1 elements into a separate library/plugin. Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones --- .../qdeclarativelayoutitem/data/layoutItem.qml | 9 -- .../qdeclarativelayoutitem.pro | 14 --- .../tst_qdeclarativelayoutitem.cpp | 125 --------------------- 3 files changed, 148 deletions(-) delete mode 100644 tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml delete mode 100644 tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro delete mode 100644 tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp (limited to 'tests/auto/declarative/qdeclarativelayoutitem') diff --git a/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml b/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml deleted file mode 100644 index 349713397c..0000000000 --- a/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 1.0 - -LayoutItem {//Sized by the layout - id: resizable - objectName: "resizable" - minimumSize: "100x100" - maximumSize: "300x300" - preferredSize: "200x200" -} diff --git a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro deleted file mode 100644 index 6c38af4da1..0000000000 --- a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro +++ /dev/null @@ -1,14 +0,0 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui -macx:CONFIG -= app_bundle - -SOURCES += tst_qdeclarativelayoutitem.cpp - -symbian: { - importFiles.files = data - importFiles.path = . - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} -QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp deleted file mode 100644 index 0db1f4398e..0000000000 --- a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp +++ /dev/null @@ -1,125 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "../../../shared/util.h" - -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - -class tst_qdeclarativelayoutitem : public QObject -{ - Q_OBJECT -public: - tst_qdeclarativelayoutitem(); - -private slots: - void test_resizing(); -}; - -tst_qdeclarativelayoutitem::tst_qdeclarativelayoutitem() -{ -} - -void tst_qdeclarativelayoutitem::test_resizing() -{ - //Create Layout (must be done in C++) - QGraphicsView view; - QGraphicsScene scene; - QGraphicsWidget *widget = new QGraphicsWidget(); - QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(); - widget->setLayout(layout); - scene.addItem(widget); - view.setScene(&scene); - //Add the QML snippet into the layout - QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/layoutItem.qml")); - QDeclarativeLayoutItem* obj = static_cast(c.create()); - QVERIFY(obj); - QCOMPARE(obj->minimumSize(), QSizeF(100,100)); - QCOMPARE(obj->preferredSize(), QSizeF(200,200)); - QCOMPARE(obj->maximumSize(), QSizeF(300,300)); - - layout->addItem(obj); - layout->setContentsMargins(0,0,0,0); - widget->setContentsMargins(0,0,0,0); - view.show(); - - QVERIFY(obj!= 0); - - widget->setGeometry(QRectF(0,0, 400,400)); - QCOMPARE(obj->width(), 300.0); - QCOMPARE(obj->height(), 300.0); - - widget->setGeometry(QRectF(0,0, 300,300)); - QCOMPARE(obj->width(), 300.0); - QCOMPARE(obj->height(), 300.0); - - widget->setGeometry(QRectF(0,0, 200,200)); - QCOMPARE(obj->width(), 200.0); - QCOMPARE(obj->height(), 200.0); - - widget->setGeometry(QRectF(0,0, 100,100)); - QCOMPARE(obj->width(), 100.0); - QCOMPARE(obj->height(), 100.0); - - widget->setGeometry(QRectF(0,0, 40,40)); - QCOMPARE(obj->width(), 100.0); - QCOMPARE(obj->height(), 100.0); - - widget->setGeometry(QRectF(0,0, 412,112)); - QCOMPARE(obj->width(), 300.0); - QCOMPARE(obj->height(), 112.0); -} - - -QTEST_MAIN(tst_qdeclarativelayoutitem) - -#include "tst_qdeclarativelayoutitem.moc" -- cgit v1.2.3