Skip to content
GitLab
Select Git revision
  • dev default
  • 6.2
  • 6.2.2
  • 6.2.1
  • 6.1
  • 6.2.0
  • 5.12
  • 5.12.12
  • 6.1.3
  • wip/qtquickcontrols2
  • 6.0
  • 6.1.2
  • 6.1.1
  • 6.1.0
  • 5.12.11
  • wip/qquickdeliveryagent
  • 5.15
  • 6.0.0
  • 5.15.2
  • 5.12.10
  • v5.15.0-alpha1
  • v5.12.7
  • v5.14.1
  • v5.9.9
  • v5.14.0
  • v5.14.0-rc2
  • v5.14.0-rc1
  • v5.12.6
  • v5.14.0-beta3
  • v5.13.2
  • v5.14.0-beta2
  • v5.14.0-beta1
  • v5.14.0-alpha1
  • v5.12.5
  • v5.13.1
  • v5.13.0
  • v5.13.0-rc3
  • v5.12.4
  • v5.13.0-rc2
  • v5.13.0-rc1
Find file BlameHistoryPermalink
  • Kent Hansen's avatar
    Say hello to QtQuick module · 6c8378ea
    Kent Hansen authored 
    
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>
    6c8378ea
qquickimagebase_p_p.h 2.77 KiB
1 
// Commit: 6f78a6080b84cc3ef96b73a4ff58d1b5a72f08f4
2 
/****************************************************************************
3 
**
4 
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
5 
** All rights reserved.
6 
** Contact: Nokia Corporation (qt-info@nokia.com)
7 
**
8 
** This file is part of the QtDeclarative module of the Qt Toolkit.
9 
**
10 
** $QT_BEGIN_LICENSE:LGPL$
11 
** GNU Lesser General Public License Usage
12 
** This file may be used under the terms of the GNU Lesser General Public
13 
** License version 2.1 as published by the Free Software Foundation and
14 
** appearing in the file LICENSE.LGPL included in the packaging of this
15 
** file. Please review the following information to ensure the GNU Lesser
16 
** General Public License version 2.1 requirements will be met:
17 
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
18 
**
19 
** In addition, as a special exception, Nokia gives you certain additional
20 
** rights. These rights are described in the Nokia Qt LGPL Exception
21 
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
22 
**
23 
** GNU General Public License Usage
24 
** Alternatively, this file may be used under the terms of the GNU General
25 
** Public License version 3.0 as published by the Free Software Foundation
26 
** and appearing in the file LICENSE.GPL included in the packaging of this
27 
** file. Please review the following information to ensure the GNU General
28 
** Public License version 3.0 requirements will be met:
29 
** http://www.gnu.org/copyleft/gpl.html.
30 
**
31 
** Other Usage
32 
** Alternatively, this file may be used in accordance with the terms and
33 
** conditions contained in a signed written agreement between you and Nokia.
34 
**
35 
**
36 
**
37 
**
38 
**
39 
** $QT_END_LICENSE$
40 
**
41 
****************************************************************************/
42
43 
#ifndef QQUICKIMAGEBASE_P_P_H
44 
#define QQUICKIMAGEBASE_P_P_H
45
46 
//
47 
//  W A R N I N G
48 
//  -------------
49 
//
50 
// This file is not part of the Qt API.  It exists purely as an
51 
// implementation detail.  This header file may change from version to
52 
// version without notice, or even be removed.
53 
//
54 
// We mean it.
55 
//
56
57 
#include "qquickimplicitsizeitem_p_p.h"
58 
#include "qquickimagebase_p.h"
59
60 
#include <QtQuick/private/qdeclarativepixmapcache_p.h>
61
62 
QT_BEGIN_NAMESPACE
63
64 
class QNetworkReply;
65 
class QQuickImageBasePrivate : public QQuickImplicitSizeItemPrivate
66 
{
67 
    Q_DECLARE_PUBLIC(QQuickImageBase)
68
69 
public:
70 
    QQuickImageBasePrivate()
717273747576777879808182838485868788899091929394
: status(QQuickImageBase::Null), progress(0.0), explicitSourceSize(false), async(false), cache(true), mirror(false) { } QDeclarativePixmap pix; QQuickImageBase::Status status; QUrl url; qreal progress; QSize sourcesize; bool explicitSourceSize : 1; bool async : 1; bool cache : 1; bool mirror: 1; }; QT_END_NAMESPACE #endif // QQUICKIMAGEBASE_P_P_H