aboutsummaryrefslogtreecommitdiffstats
path: root/sync.profile
Commit message (Collapse)AuthorAgeFilesLines
* fix QtQmlDevTools in framework builds in a better wayOswald Buddenhagen2017-04-111-6/+0
| | | | | | | | | | | 6767fcfaf basically gave up and gave the module an own set of headers. however, we now have improved infrastructure for borrowing headers. while this may look uglier, the maintenance burden is lower, and it's consistent with other bootstrapped modules. Change-Id: I6ddcbbc01fa085a3c6bf333b03a9fdfc19061836 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-151-11/+0
|\ | | | | | | | | | | | | | | Conflicts: src/qmldevtools/qmldevtools.pro tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp Change-Id: I12255c16716bd8a74e7047cdb1f9302a4d1ea827
| * remove dependencies from sync.profileOswald Buddenhagen2016-11-051-11/+0
| | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: I1be0b8a494a5f7db02fa82ec46de2ec3573dd485 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Move QQmlDebugClient into separate static libraryUlf Hermann2015-10-301-0/+1
| | | | | | | | | | Change-Id: Ib3daf9da2cf6798bd022cfcf54d11e565c9cb4ca Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Put QPacketProtocol into its own static libraryUlf Hermann2015-10-151-0/+1
|/ | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-03-171-1/+1
|\ | | | | | | Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6
| * Fix usage of QtQmlDevTools private headers on OSX with framework buildsSimon Hausmann2015-03-161-1/+1
|/ | | | | | | | | | | | | | | | 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>
* Update glyph cache type/format logic to match qtbase changesTor Arne Vestbø2014-02-201-1/+1
| | | | | | | | | | 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>
* Pin qtbase to merge from dev while we integrate glyph cache changesTor Arne Vestbø2014-02-191-1/+1
| | | | | Change-Id: I4ab46977ec0f137e2bb5a41c67dc09ee962a8b82 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Unpin qtbase in preperation for merge to stableTor Arne Vestbø2014-02-171-1/+1
| | | | | Change-Id: I833937c85269dfaca7f28fd06c3f55729037b800 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Introducing QQuickWidgetLars Knoll2014-02-171-0/+1
| | | | | | | | | | | 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>
* Update pin of qtbase so that the qtquickcontrols revdep buildsSimon Hausmann2014-02-171-1/+1
| | | | | Change-Id: I3dbbad674be889ec6ca0c2ec66e2c995c5b0839b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Pin qtbase version so we can integrate glyph format changesTor Arne Vestbø2014-02-151-1/+1
| | | | | | | | 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>
* Revert "Temporarily pin qtbase to a working version..."Simon Hausmann2013-09-031-1/+1
| | | | | | | | | This reverts commit 57c81a2b4b67bc001a28060527325f4016e42ffb qtbase should be fixed now Change-Id: I8179509d7549955ee9f78b3213f59c3a1f5e5c59 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix generation of headers by syncqt.pl outside git buildsSergio Ahumada2013-09-021-1/+1
| | | | | | | | This seems to be a left over from 3cefb43441a9879cc512dc3fcc7dca0d42e9ca8c Change-Id: Ib229c69e42140e073b9dd375d0fc2ede658c4ac8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Temporarily pin qtbase to a working version...Simon Hausmann2013-09-021-1/+1
| | | | | | | | ... 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>
* Remove dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-131-1/+0
| | | | | | | This isn't needed anymore Change-Id: I0baf3eeb19221dd9c85cfe0f1af34c92d2b13d63 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* sync.profile: Point dependencies to an empty string againSergio Ahumada2013-08-061-3/+3
| | | | | Change-Id: Ia39c708722ad99b43d3aa2541eb22524ff819ebb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Re-add qtjsbackendSimon Hausmann2013-06-241-0/+1
| | | | | | | | 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>
* Prospective fix for sync.profile for CI runs on the branchSimon Hausmann2013-06-241-2/+2
| | | | | | | Don't try to check out wip/v4 in qtbase and qtxmlpatterns Change-Id: I1b4cb3f83ba62123414f184e141f52bbaac79827 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into ↵Simon Hausmann2013-06-241-2/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wip/v4 Conflicts: src/imports/qtquick2/plugins.qmltypes src/qml/debugger/qv8debugservice.cpp src/qml/qml/qml.pri src/qml/qml/qqmlcompiler.cpp src/qml/qml/qqmlcomponent.cpp src/qml/qml/qqmlcontext.cpp src/qml/qml/qqmldata_p.h src/qml/qml/qqmlengine_p.h src/qml/qml/qqmljavascriptexpression.cpp src/qml/qml/qqmlxmlhttprequest.cpp src/qml/qml/v4/qv4bindings.cpp src/qml/qml/v4/qv4irbuilder.cpp src/qml/qml/v4/qv4jsonobject_p.h src/qml/qml/v8/qqmlbuiltinfunctions.cpp src/qml/qml/v8/qv8bindings.cpp src/qml/qml/v8/qv8contextwrapper.cpp src/qml/qml/v8/qv8listwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper_p.h src/qml/qml/v8/qv8sequencewrapper_p_p.h src/qml/qml/v8/qv8typewrapper.cpp src/qml/qml/v8/qv8valuetypewrapper.cpp src/qml/types/qqmldelegatemodel.cpp src/quick/items/context2d/qquickcanvasitem.cpp src/quick/items/context2d/qquickcontext2d.cpp sync.profile tests/auto/qml/qjsengine/tst_qjsengine.cpp tests/benchmarks/qml/animation/animation.pro tools/qmlprofiler/qmlprofiler.pro Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9
| * sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | 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>
| * sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada2012-12-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix compilation with built-in v4vm JS engineSimon Hausmann2013-04-151-1/+0
| | | | | | | | | | Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-131-3/+3
|/ | | | | | | | | | | | 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>
* Remove remnants of QQmlImageProviderKent Hansen2012-08-091-4/+0
| | | | | | | | QQmlImageProvider was renamed to QQuickImageProvider quite some time ago. Change-Id: I2f737f1e2a543c0abb0f45170499c41de25cf696 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-261-10/+0
| | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-261-7/+0
| | | | | Change-Id: I90090bcf60ecc2c3fb31a38129edeae8ff0f1c55 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove qtbase pinKent Hansen2012-06-121-1/+1
| | | | | Change-Id: I0fa3fb45aa26fe4eca15fa0bcb1f67c99925a21e Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Pin the qtbase SHA1Kent Hansen2012-06-111-1/+1
| | | | | | | | | | | | | 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>
* Allow qtdeclarative to compile with -no-widgetsMartin Jones2012-06-051-1/+0
| | | | | | | | 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>
* Remove QtDeclarative compatibility moduleKent Hansen2012-05-141-184/+0
| | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-04-171-2/+6
|\ | | | | | | Change-Id: I39905acde16ba6bb0ba39401cb73082a73dd9167
| * Fix the build & docs after QQmlImageProvider was renamedKent Hansen2012-03-201-2/+6
| | | | | | | | | | | | | | | | The class was renamed to QQuickImageProvider in commit 3bc907d155034fe64efc8cb6056b48f0c6401bfb. Change-Id: I91ff38244cee3ab651ed6caa4140a58cb742f1c9 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * api_changes branch should track qtbase/api_changesKent Hansen2012-03-131-1/+1
| | | | | | | | | | Change-Id: Ic41027db127bd3cb84a1e8734c016668ec328215 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Extract Particles code to an independent libraryMatthew Vogt2012-04-161-0/+3
|/ | | | | | | | | 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>
* Remove pin of qtbase for qtdeclarative.Sergio Ahumada2012-03-121-1/+1
| | | | | Change-Id: Ib70a3438d085adbed3a1ca7df81d593c7a512ae0 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Pin qtbase at known-good change ID.Matthew Vogt2012-03-091-1/+1
| | | | | Change-Id: I889a427bf1bddbcc70255f4efb47b803f18dd89e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Create a forwarding declarative module.Matthew Vogt2012-02-271-0/+185
| | | | | | | | | | | | | | | | | | | | 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>
* api_changes branch should build against qtBase/api_changesMatthew Vogt2012-02-241-1/+1
| | | | | Change-Id: I1f00f21cd5acc03e8b5020a5415db28bf127ad16 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-4/+4
| | | | | | | | | | | | | 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>
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-031-2/+0
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove deprecated QtDeclarative (now QtQuick) headersKent Hansen2012-01-241-79/+0
| | | | | | | | | | | | | | | 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>
* Remove the pin to qtbase and depend on the new qtjsbackend moduleSimon Hausmann2012-01-101-1/+2
| | | | | | | This module contains our V8 dependency. Change-Id: I72b0b64fe61fe10139725d24711ea24a8a035eb4 Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
* Pin qtdeclarative to a version of qtbase that still contains QtV8Simon Hausmann2012-01-091-1/+1
| | | | | | | | 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>
* Revert "sync to an earlier qtbase"Alan Alpert2011-12-051-1/+1
| | | | | | | | | 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>
* Say hello to QtQuick moduleKent Hansen2011-12-021-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* sync to an earlier qtbaseAlan Alpert2011-12-021-1/+1
| | | | | | | | | 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>
* Change sync.profile back to using refs/heads/master for qtbaseKent Hansen2011-11-181-1/+1
| | | | | | | | | The issue that caused crashes with a more recent qtbase was fixed in commit ddf9883f8d00dcdfd908b38c60114a06ce8af185. Task-number: QTBUG-22574 Change-Id: Ia85b7265103e03f71585c5b72496af83056a4fcf Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update sync.profileAlan Alpert2011-11-161-1/+1
| | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 05:47:50 +0000