Commit 4442dea0 authored by Martin Jones's avatar Martin Jones Committed by Qt by Nokia

Extract all QtQuick 1 elements into a separate library/plugin.

Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391Reviewed-by: default avatarMartin Jones <martin.jones@nokia.com>
parent b119220d

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -43,6 +43,19 @@ set binding when its \e when clause becomes false.
QDeclarativeExpression can now be directly (and more efficiently) constructed from a
QDeclarativeScriptString.
\section2 QtQuick 1 is now a separate library and module
Writing C++ applications using QtQuick 1 specific API, i.e. QDeclarativeView or QDeclarativeItem
requires adding the "qtquick1" module to the .pro file, e.g. QT += declarative qtquick1
QDeclarativeView and QDeclarativeItem headers are now in the QtQuick 1 module, i.e.
#include <QtQuick1/QDeclarativeView>
#include <QtQuick1/QDeclarativeItem>
"import QtQuick 1.0" loads the module dynamically. To deploy QtQuick 1 applications
the library (lib/libQtQuick1*) and plugin (imports/QtQuick/) must be installed.
\section1 Qt 4.7.4 includes QtQuick 1.1
QtQuick 1.1 is a minor feature update. \e {import QtQuick 1.1} to use the new
......
TEMPLATE = lib
CONFIG += qt plugin
QT += declarative
QT += declarative qtquick1
DESTDIR = ImageProviderCore
TARGET = qmlimageproviderplugin
......
......@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = networkaccessmanagerfactory
DEPENDPATH += .
INCLUDEPATH += .
QT += declarative network
QT += declarative network qtquick1
# Input
SOURCES += main.cpp
......
......@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET =
DEPENDPATH += .
INCLUDEPATH += .
QT += declarative
QT += declarative qtquick1
SOURCES += main.cpp
RESOURCES += layoutitem.qrc
TEMPLATE = app
TARGET = qgraphicsgridlayout
QT += declarative
QT += declarative qtquick1
SOURCES += \
gridlayout.cpp \
......
TEMPLATE = app
TARGET = qgraphicslinearlayout
QT += declarative
QT += declarative qtquick1
SOURCES += \
linearlayout.cpp \
......
......@@ -40,7 +40,7 @@
****************************************************************************/
#include <QtGui/QApplication>
#include <QtDeclarative/QDeclarativeView>
#include <QtQuick1/QDeclarativeView>
#include <QtDeclarative/QDeclarativeContext>
#include <QtDeclarative/QDeclarativeEngine>
......
TEMPLATE = app
TARGET = minehunt
QT += declarative
QT += declarative qtquick1
# Input
HEADERS += minehunt.h
......
......@@ -43,8 +43,8 @@
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
#include <qdeclarative.h>
#include <qdeclarativeitem.h>
#include <qdeclarativeview.h>
#include <qsgitem.h>
#include <qsgview.h>
#include "dataobject.h"
......@@ -64,7 +64,8 @@ int main(int argc, char ** argv)
dataList.append(new DataObject("Item 3", "blue"));
dataList.append(new DataObject("Item 4", "yellow"));
QDeclarativeView view;
QSGView view;
view.setResizeMode(QSGView::SizeRootObjectToView);
QDeclarativeContext *ctxt = view.rootContext();
ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
//![0]
......
......@@ -38,12 +38,11 @@
**
****************************************************************************/
import QtQuick 1.0
import QtQuick 2.0
//![0]
ListView {
width: 100; height: 100
anchors.fill: parent
model: myModel
delegate: Rectangle {
......
......@@ -43,8 +43,8 @@
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
#include <qdeclarative.h>
#include <qdeclarativeitem.h>
#include <qdeclarativeview.h>
#include <qsgitem.h>
#include <qsgview.h>
/*
......@@ -63,7 +63,7 @@ int main(int argc, char ** argv)
dataList.append("Item 3");
dataList.append("Item 4");
QDeclarativeView view;
QSGView view;
QDeclarativeContext *ctxt = view.rootContext();
ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
//![0]
......
......@@ -38,12 +38,11 @@
**
****************************************************************************/
import QtQuick 1.0
import QtQuick 2.0
//![0]
ListView {
width: 100; height: 100
anchors.fill: parent
model: myModel
delegate: Rectangle {
......
QT += declarative
QT += declarative qtquick1
HEADERS += piechart.h
SOURCES += piechart.cpp \
......
QT += declarative
QT += declarative qtquick1
HEADERS += piechart.h
SOURCES += piechart.cpp \
......
QT += declarative
QT += declarative qtquick1
HEADERS += piechart.h
SOURCES += piechart.cpp \
......
QT += declarative
QT += declarative qtquick1
HEADERS += piechart.h \
pieslice.h
......
QT += declarative
QT += declarative qtquick1
HEADERS += piechart.h \
pieslice.h
......