Commit 6c8378ea authored by Kent Hansen's avatar Kent Hansen Committed by Qt by Nokia

Say hello to QtQuick module

This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.

99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.

The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.

All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.

A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.

The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)

There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.

In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.

Task-number: QTBUG-22889
Reviewed-by: default avatarLars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: default avatarKent Hansen <kent.hansen@nokia.com>
Reviewed-by: default avatarSergio Ahumada <sergio.ahumada@nokia.com>
parent e01219b7

Too many changes to show.

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

/****************************************************************************
**
** 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 documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
** GNU Free Documentation License
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** this file.
**
** 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$
**
****************************************************************************/
/*!
\module QtQuick
\title Qt Quick Module
\ingroup modules
\brief The Qt Quick module provides classes for embedding Qt Quick
in Qt/C++ applications.
To include the definitions of the module's classes, use the
following directive:
\code
#include <QtQuick>
\endcode
To link against the module, add this line to your \l qmake \c
.pro file:
\code
QT += quick
\endcode
For more information on the Qt Quick module, see the
\l{Qt Quick} documentation.
*/
......@@ -44,7 +44,7 @@
#include <QDeclarativeEngine>
#include <QDeclarativeNetworkAccessManagerFactory>
#include <QQuickView>
#include <QtQuick/QQuickView>
/*
......
......@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = networkaccessmanagerfactory
DEPENDPATH += .
INCLUDEPATH += .
QT += declarative network
QT += declarative quick network
# Input
SOURCES += main.cpp
......
......@@ -40,7 +40,7 @@
****************************************************************************/
#include <QtGui/QGuiApplication>
#include <qquickview.h>
#include <QtQuick/qquickview.h>
#include <QtDeclarative/QDeclarativeContext>
#include <QtDeclarative/QDeclarativeEngine>
......
TEMPLATE = app
TARGET = minehunt
QT += declarative
QT += declarative quick
# Input
HEADERS += minehunt.h
......
......@@ -2,9 +2,9 @@ TEMPLATE = app
TARGET = abstractitemmodel
DEPENDPATH += .
INCLUDEPATH += .
QT += declarative
QT += declarative quick
HEADERS = model.h
SOURCES = main.cpp \
model.cpp
RESOURCES += abstractitemmodel.qrc
\ No newline at end of file
RESOURCES += abstractitemmodel.qrc
......@@ -43,8 +43,8 @@
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
#include <qdeclarative.h>
#include <qquickitem.h>
#include <qquickview.h>
#include <QtQuick/qquickitem.h>
#include <QtQuick/qquickview.h>
//![0]
int main(int argc, char ** argv)
......
......@@ -43,8 +43,8 @@
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
#include <qdeclarative.h>
#include <qquickitem.h>
#include <qquickview.h>
#include <QtQuick/qquickitem.h>
#include <QtQuick/qquickview.h>
#include "dataobject.h"
......
......@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = objectlistmodel
DEPENDPATH += .
INCLUDEPATH += .
QT += declarative
QT += declarative quick
# Input
SOURCES += main.cpp \
......
......@@ -44,8 +44,8 @@
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
#include <qdeclarative.h>
#include <qquickitem.h>
#include <qquickview.h>
#include <QtQuick/qquickitem.h>
#include <QtQuick/qquickview.h>
/*
......
......@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = stringlistmodel
DEPENDPATH += .
INCLUDEPATH += .
QT += declarative
QT += declarative quick
# Input
SOURCES += main.cpp
......
......@@ -41,7 +41,7 @@
#include <QGuiApplication>
#include <QQuickView>
#include <QtQuick/QQuickView>
#include "squircle.h"
......
QT += declarative
QT += declarative quick
TEMPLATE = app
DEPENDPATH += .
......
......@@ -41,8 +41,8 @@
#include "squircle.h"
#include <qsgengine.h>
#include <qquickcanvas.h>
#include <QtQuick/qsgengine.h>
#include <QtQuick/qquickcanvas.h>
#include <QOpenGLShaderProgram>
Squircle::Squircle()
......
......@@ -42,7 +42,7 @@
#ifndef SQUIRCLE_H
#define SQUIRCLE_H
#include <QtDeclarative/QQuickItem>
#include <QtQuick/QQuickItem>
#include <QtGui/QOpenGLShaderProgram>
class Squircle : public QQuickItem
......
......@@ -41,8 +41,8 @@
#include <QGuiApplication>
#include <QPainter>
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qquickview.h>
#include <QtDeclarative/qquickpainteditem.h>
#include <QtQuick/qquickview.h>
#include <QtQuick/qquickpainteditem.h>
class MyPaintItem : public QQuickPaintedItem
{
Q_OBJECT
......
TEMPLATE = app
TARGET = painteditem
QT += declarative
QT += declarative quick