the CI obtains them from the qt5 super repo nowadays.
Change-Id: I1be0b8a494a5f7db02fa82ec46de2ec3573dd485
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
We need it in 3 places in qtdeclarative and we could also use it in
QtCreator. We don't want to bundle it with the debug client code as it
is also necessary for the server.
QPacket replaces QQmlDebugStream as it has the same purpose. This
also fixes the inconsitent handling of data stream versions.
Change-Id: I650fae353f267511c551b427d9169f4d718aa7f2
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Previously this module borrowed its private headers from QtQml, so that
when writing QT += qmldevtools-private, you'd get the private headers from
QtQml. This doesn't work when QtQml is built as a framework.
A cleaner solution is to give this module its headers proper by letting
syncqt create the forwarding headers correctly (and consequently also
include them in make install). In order for this to work, the included
headers themselves cannot include any headers from QtQml, which this
patch also takes care of, through a centralized inclusion of qv4global_p.h.
Change-Id: I9bb8337956a2774cfaca6b338369face6c6ee785
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
https://codereview.qt-project.org/#change,77791 unified the glyph format
between QFontEngine and QFontEngineGlyphCache.
Now that we're up to date with qtbase, we can unpin the dependency.
Change-Id: Ibcafccb741ce94b454ff7c469804f44fef7fe06f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Renders into an FBO, and provides a texture that is
composed by the QPA/widget kernel compositor.
Also introducing QQuickRenderControl, which is private
API for now.
Change-Id: I710c16e1506124a17f91e87344496471803a448b
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Will be unpined along with an update that matches the changes in
https://codereview.qt-project.org/#change,77791
Change-Id: I5b9572d21e2cca8dc0078eb0079f6d42af6dd6d4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This reverts commit 57c81a2b4b67bc001a28060527325f4016e42ffb
qtbase should be fixed now
Change-Id: I8179509d7549955ee9f78b3213f59c3a1f5e5c59
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This seems to be a left over from 3cefb43441
Change-Id: Ib229c69e42140e073b9dd375d0fc2ede658c4ac8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
... so that we can continue to develop while qtbase is being fixed to
allow compiling qtdeclarative on mac with no-framework debug builds.
Change-Id: I2e1f4c1b82560a2f49205035aaca3078f9d28061
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This is not an actual dependency, but required to build with qt.pro in the
CI system. This can be reverted again when merging back to dev.
Change-Id: I48f038553754b971e0ce37587afe43dabf4e50cf
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Don't try to check out wip/v4 in qtbase and qtxmlpatterns
Change-Id: I1b4cb3f83ba62123414f184e141f52bbaac79827
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
This means that we are going to use the same branch name for the
dependencies as the branch of the repository under test.
If we are testing the 'stable' branch, all dependencies will point
to the 'stable' branch as well.
Change-Id: I0959eea83b620af805b2113422bae5ae306af120
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
We should test dev branches against dev branches only by default.
At some point we should automate the merges from release->stable->dev
andi/or decide how to handle possible conflicts.
This is good enough for the time being.
Change-Id: Ifeae1b5de37e7bcaefbfa9038e50f3667645eca2
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
We should test stable branches against stable branches only.
At some point we should automate the merges from dev->stable->release
and decide how to handle possible merge conflicts.
This is good enough for the time being.
Change-Id: Idc68c5c4653375b1805638b80c2a9e8f5a2cacad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
QQmlImageProvider was renamed to QQuickImageProvider quite some time
ago.
Change-Id: I2f737f1e2a543c0abb0f45170499c41de25cf696
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
In preparation of staging
https://codereview.qt-project.org/#change,27471 in qtbase, which
isn't source/behaviorally compatible with qtdeclarative.
https://codereview.qt-project.org/#change,27477 adapts qtdeclarative
to the qtbase change, and will be staged (together with the change
that unpins the SHA1) once the qtbase change has gone in.
Change-Id: Ia47f1d86855a388a5ecf9520ed21dd52c43b1b95
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
We have no hard requirement for QtWidgets library, so we should
build without it.
Change-Id: I85c85cc1a52bf9daa7ab7916f19bf7cc3ad5845f
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
When the QtDeclarative module was renamed to QtQml, a compatibility
module was introduced to avoid disrupting downstream projects.
Time has passed, and it's now appropriate to remove this module.
Existing projects that haven't ported can still use the
bin/rename-qtdeclarative-symbols.sh script to ease the porting.
Change-Id: I05a9727013d9e38c2262577f68260a4382bfbeea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Donald Carr <donald.carr@nokia.com>
QtQuick clients that do not use particles features should not have
to load these classes.
Task-number: QTBUG-25178
Change-Id: Ib15f7655dc4d821595e06f9160d2770375279027
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
The class was renamed to QQuickImageProvider in commit
3bc907d155.
Change-Id: I91ff38244cee3ab651ed6caa4140a58cb742f1c9
Reviewed-by: Martin Jones <martin.jones@nokia.com>
The declarative module has been replaced by the qml module. To allow
existing projects which depend on the old declarative module to build,
add a new declarative module which forwards dependencies on to the
new qml module.
This module contains only redefinitions of old symbol names to their
new replacements, and creates forwarding headers that include the
replacement headers provided by the qml module.
This is a temporary change to prevent breaking existing projects
that depend on the declarative module. After clients have had an
opportunity to update their code to the use the new interfaces,
it can be removed.
Task-number: QTBUG-23737
Change-Id: I3cec5ceec4f9725c258e3672360a05ea87d3ca2f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
QtQuick1 is now contained in a separate repository.
Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
The QtQuick module has been around for a while now, and the need to
port to it was duly announced, coupled with a qmake warning (which
has now been removed).
Users who haven't ported their includes over will have to do so as
of this commit.
The fixqt4headers script in qtbase can be used to automatically
update the stale include statements in existing projects.
Change-Id: I9745723246f65ef726e51b8551d18b378085689d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This is a temporary measure until the new qtjsbackend module is fully in
place.
Change-Id: I5cfe277ee6a14680f378dd4d4c0f94dfa56fbac3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This reverts commit 3a034c19c89c9528df8b7e2ee9e9a23bd7684958.
The conflicting change in qtbase was also reverted, so there should no
longer be a need for the earlier qtbase.
Change-Id: I91303410378e1a6e0f86286dd402810b24b6d4ec
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
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>
change ba635d7e74472f3a54c0c4686966af46d9035c6f breaks qtdeclarative CI.
Using an earlier qtbase while the matter is investigated.
Task-Number: QTBUG-22985
Change-Id: I2d1c5f03f48d4383fd84a42612314bea0bdc675d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
The issue that caused crashes with a more recent qtbase
was fixed in commit ddf9883f8d.
Task-number: QTBUG-22574
Change-Id: Ia85b7265103e03f71585c5b72496af83056a4fcf
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
202127f860208c21145e05685bc54219e1655dbd in qtbase introduces widespread
regressions, but it was also fixing a test failure inexplicably caused
(presumably by qtbase). Use the last good qtbase from qt5.git until
these issues are resolved.
Task-number: QTBUG-22754
Change-Id: Ic6a1272d2079337fb45a6a46f3704380a5a19d73
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Liang Qi
Oswald Buddenhagen
Ulf Hermann
Simon Hausmann
Tor Arne Vestbø
Tor Arne Vestbø
Lars Knoll
Simon Hausmann
Sergio Ahumada
Kent Hansen
Oswald Buddenhagen
Martin Jones
Lars Knoll
Matthew Vogt
Sergio Ahumada
Simon Hausmann
Alan Alpert