summaryrefslogtreecommitdiffstats
path: root/sync.profile
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into old/5.0old/5.0Oswald Buddenhagen2013-04-111-8/+8
|\ | | | | | | Change-Id: If07b91b27071346ff6ab831be4eb1173e8024f34
| * point dependencies to 'release' branchesSergio Ahumada2012-12-181-8/+8
|/ | | | | | Change-Id: Id025dd987dc759941cc4022ee6814e8f599b562c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada2012-12-041-8/+8
| | | | | | | | | | | 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: Ic8e80a8db60c8fae950e1327bc8ac66c1940872d Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Revert "Temporarily disable WebKit as build dependency for QtQuick1"Simon Hausmann2012-10-191-1/+1
| | | | | | | | | This reverts commit 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 WebKit should be fixed now and this was supposed to be a temporary move only. Change-Id: I1e3adb55ed5b98e437b45cbc9c6f7e7f9eeb85a9 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Rename the QtQuick1 module back to QtDeclarativeFriedemann Kleint2012-10-171-1/+1
| | | | | | | | | | | | | | | | | Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Temporarily disable WebKit as build dependency for QtQuick1Simon Hausmann2012-10-171-1/+1
| | | | | | | | | The CI system is having trouble building WebKit and in the meantime let's build this module without to allow for the integration of unrelated changes. Change-Id: Ifbdf59863c8bc42b5912e2631649b68649254893 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add QtQuick1 WebKit integration (from QtWebKit module)Simon Hausmann2012-09-271-0/+1
| | | | | | | | This adds the QML1 QDeclarativeWebView integration to the default build (it was added a while ago) as well as the unit tests. Change-Id: I7324f5a3b00716d4b300e8c11d9ea3b8b9577da3 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Remove phonon as per removal in qt5.Toby Tomkins2012-08-011-1/+0
| | | | | | | | 5fb5e0dfc7d794df882408d4c7b6c0e14073282b removes qtphonon from qt5 compilation, also remove it in this repository. Change-Id: Iab05e978cc85a6191618faab745ef3a5744d089f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* add missing tools dependencyOswald Buddenhagen2012-06-281-0/+5
| | | | | | | | since the move of the designer plugin here, we depend on the qttools module. Change-Id: Ia73900ad286ef1bc492b919d64f3021dcced2d17 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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 Change-Id: I4b3a1cd560e99658102d374fb278fe3e7744bae9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-261-3/+0
| | | | | Change-Id: Ia96fa9e0ba43de4c32053699d0e9528ef308fb67 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Add QtScript and QtWidgets dependencies to sync.profile.Andrew den Exter2012-02-061-0/+2
| | | | | Change-Id: I93b98270168259f954eef68556071c7c9847e29b Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Modify QtQuick1 to build in Qt5Matthew Vogt2012-01-311-0/+25
Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones <martin.jones@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 12:55:43 +0000