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: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>

1 files changed, 0 insertions, 302 deletions

diff --git a/src/declarative/items/qquicktextinput_p.h b/src/declarative/items/qquicktextinput_p.h
deleted file mode 100644
index 493788ec84..0000000000
--- a/src/declarative/items/qquicktextinput_p.h
+++ /dev/null
@@ -1,302 +0,0 @@
-// Commit: 2f173e4945dd8414636c1061acfaf9c2d8b718d8
-/****************************************************************************
-**
-** 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 QtDeclarative module 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$
-**
-****************************************************************************/
-
-#ifndef QQUICKTEXTINPUT_P_H
-#define QQUICKTEXTINPUT_P_H
-
-#include "qquickimplicitsizeitem_p.h"
-#include <QtGui/qvalidator.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QQuickTextInputPrivate;
-class QValidator;
-class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem
-{
-    Q_OBJECT
-    Q_ENUMS(HAlignment)
-    Q_ENUMS(EchoMode)
-    Q_ENUMS(SelectionMode)
-
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
-    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-    Q_PROPERTY(QColor selectionColor READ selectionColor WRITE setSelectionColor NOTIFY selectionColorChanged)
-    Q_PROPERTY(QColor selectedTextColor READ selectedTextColor WRITE setSelectedTextColor NOTIFY selectedTextColorChanged)
-    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
-    Q_PROPERTY(HAlignment horizontalAlignment READ hAlign WRITE setHAlign RESET resetHAlign NOTIFY horizontalAlignmentChanged)
-    Q_PROPERTY(HAlignment effectiveHorizontalAlignment READ effectiveHAlign NOTIFY effectiveHorizontalAlignmentChanged)
-
-    Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly NOTIFY readOnlyChanged)
-    Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged)
-    Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
-    Q_PROPERTY(QRect cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged)
-    Q_PROPERTY(QDeclarativeComponent *cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)
-    Q_PROPERTY(int selectionStart READ selectionStart NOTIFY selectionStartChanged)
-    Q_PROPERTY(int selectionEnd READ selectionEnd NOTIFY selectionEndChanged)
-    Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectedTextChanged)
-
-    Q_PROPERTY(int maximumLength READ maxLength WRITE setMaxLength NOTIFY maximumLengthChanged)
-#ifndef QT_NO_VALIDATOR
-    Q_PROPERTY(QValidator* validator READ validator WRITE setValidator NOTIFY validatorChanged)
-#endif
-    Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask NOTIFY inputMaskChanged)
-    Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ imHints WRITE setIMHints)
-
-    Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged)
-    Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged)
-    Q_PROPERTY(bool activeFocusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY activeFocusOnPressChanged)
-    Q_PROPERTY(QString passwordCharacter READ passwordCharacter WRITE setPasswordCharacter NOTIFY passwordCharacterChanged)
-    Q_PROPERTY(QString displayText READ displayText NOTIFY displayTextChanged)
-    Q_PROPERTY(bool autoScroll READ autoScroll WRITE setAutoScroll NOTIFY autoScrollChanged)
-    Q_PROPERTY(bool selectByMouse READ selectByMouse WRITE setSelectByMouse NOTIFY selectByMouseChanged)
-    Q_PROPERTY(SelectionMode mouseSelectionMode READ mouseSelectionMode WRITE setMouseSelectionMode NOTIFY mouseSelectionModeChanged)
-    Q_PROPERTY(bool canPaste READ canPaste NOTIFY canPasteChanged)
-    Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged)
-
-public:
-    QQuickTextInput(QQuickItem * parent=0);
-    ~QQuickTextInput();
-
-    enum EchoMode {//To match QLineEdit::EchoMode
-        Normal,
-        NoEcho,
-        Password,
-        PasswordEchoOnEdit
-    };
-
-    enum HAlignment {
-        AlignLeft = Qt::AlignLeft,
-        AlignRight = Qt::AlignRight,
-        AlignHCenter = Qt::AlignHCenter
-    };
-
-    enum SelectionMode {
-        SelectCharacters,
-        SelectWords
-    };
-
-    enum CursorPosition {
-        CursorBetweenCharacters,
-        CursorOnCharacter
-    };
-
-    //Auxilliary functions needed to control the TextInput from QML
-    Q_INVOKABLE int positionAt(int x) const;
-    Q_INVOKABLE int positionAt(int x, CursorPosition position) const;
-    Q_INVOKABLE QRectF positionToRectangle(int pos) const;
-    Q_INVOKABLE void moveCursorSelection(int pos);
-    Q_INVOKABLE void moveCursorSelection(int pos, SelectionMode mode);
-
-    Q_INVOKABLE void openSoftwareInputPanel();
-    Q_INVOKABLE void closeSoftwareInputPanel();
-
-    QString text() const;
-    void setText(const QString &);
-
-    QFont font() const;
-    void setFont(const QFont &font);
-
-    QColor color() const;
-    void setColor(const QColor &c);
-
-    QColor selectionColor() const;
-    void setSelectionColor(const QColor &c);
-
-    QColor selectedTextColor() const;
-    void setSelectedTextColor(const QColor &c);
-
-    HAlignment hAlign() const;
-    void setHAlign(HAlignment align);
-    void resetHAlign();
-    HAlignment effectiveHAlign() const;
-
-    bool isReadOnly() const;
-    void setReadOnly(bool);
-
-    bool isCursorVisible() const;
-    void setCursorVisible(bool on);
-
-    int cursorPosition() const;
-    void setCursorPosition(int cp);
-
-    QRect cursorRectangle() const;
-
-    int selectionStart() const;
-    int selectionEnd() const;
-
-    QString selectedText() const;
-
-    int maxLength() const;
-    void setMaxLength(int ml);
-
-#ifndef QT_NO_VALIDATOR
-    QValidator * validator() const;
-    void setValidator(QValidator* v);
-#endif
-    QString inputMask() const;
-    void setInputMask(const QString &im);
-
-    EchoMode echoMode() const;
-    void setEchoMode(EchoMode echo);
-
-    QString passwordCharacter() const;
-    void setPasswordCharacter(const QString &str);
-
-    QString displayText() const;
-
-    QDeclarativeComponent* cursorDelegate() const;
-    void setCursorDelegate(QDeclarativeComponent*);
-
-    bool focusOnPress() const;
-    void setFocusOnPress(bool);
-
-    bool autoScroll() const;
-    void setAutoScroll(bool);
-
-    bool selectByMouse() const;
-    void setSelectByMouse(bool);
-
-    SelectionMode mouseSelectionMode() const;
-    void setMouseSelectionMode(SelectionMode mode);
-
-    bool hasAcceptableInput() const;
-
-    QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
-
-    QRectF boundingRect() const;
-    bool canPaste() const;
-
-    bool isInputMethodComposing() const;
-
-    Qt::InputMethodHints imHints() const;
-    void setIMHints(Qt::InputMethodHints hints);
-
-Q_SIGNALS:
-    void textChanged();
-    void cursorPositionChanged();
-    void cursorRectangleChanged();
-    void selectionStartChanged();
-    void selectionEndChanged();
-    void selectedTextChanged();
-    void accepted();
-    void acceptableInputChanged();
-    void colorChanged(const QColor &color);
-    void selectionColorChanged(const QColor &color);
-    void selectedTextColorChanged(const QColor &color);
-    void fontChanged(const QFont &font);
-    void horizontalAlignmentChanged(HAlignment alignment);
-    void readOnlyChanged(bool isReadOnly);
-    void cursorVisibleChanged(bool isCursorVisible);
-    void cursorDelegateChanged();
-    void maximumLengthChanged(int maximumLength);
-    void validatorChanged();
-    void inputMaskChanged(const QString &inputMask);
-    void echoModeChanged(EchoMode echoMode);
-    void passwordCharacterChanged();
-    void displayTextChanged();
-    void activeFocusOnPressChanged(bool activeFocusOnPress);
-    void autoScrollChanged(bool autoScroll);
-    void selectByMouseChanged(bool selectByMouse);
-    void mouseSelectionModeChanged(SelectionMode mode);
-    void canPasteChanged();
-    void inputMethodComposingChanged();
-    void effectiveHorizontalAlignmentChanged();
-
-protected:
-    virtual void geometryChanged(const QRectF &newGeometry,
-                                 const QRectF &oldGeometry);
-
-    void mousePressEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mouseDoubleClickEvent(QMouseEvent *event);
-    void keyPressEvent(QKeyEvent* ev);
-    void inputMethodEvent(QInputMethodEvent *);
-    void mouseUngrabEvent();
-    bool event(QEvent *e);
-    void focusInEvent(QFocusEvent *event);
-    virtual void itemChange(ItemChange, const ItemChangeData &);
-    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data);
-
-public Q_SLOTS:
-    void selectAll();
-    void selectWord();
-    void select(int start, int end);
-    void deselect();
-    bool isRightToLeft(int start, int end);
-#ifndef QT_NO_CLIPBOARD
-    void cut();
-    void copy();
-    void paste();
-#endif
-
-private Q_SLOTS:
-    void updateSize(bool needsRedraw = true);
-    void q_textChanged();
-    void selectionChanged();
-    void createCursor();
-    void cursorPosChanged();
-    void updateCursorRectangle();
-    void updateRect(const QRect &r = QRect());
-    void q_canPasteChanged();
-
-private:
-    Q_DECLARE_PRIVATE(QQuickTextInput)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QQuickTextInput)
-#ifndef QT_NO_VALIDATOR
-QML_DECLARE_TYPE(QValidator)
-QML_DECLARE_TYPE(QIntValidator)
-QML_DECLARE_TYPE(QDoubleValidator)
-QML_DECLARE_TYPE(QRegExpValidator)
-#endif
-
-QT_END_HEADER
-
-#endif // QQUICKTEXTINPUT_P_H