| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Ic463237518c930fe367d0458859caa0050f45929
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: I9bc9d2df9ce434453c652ac97bb786e6400d5af1
Reviewed-by: Iikka Eklund <iikka.eklund@digia.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: Ic8e80a8db60c8fae950e1327bc8ac66c1940872d
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
5fb5e0dfc7d794df882408d4c7b6c0e14073282b removes qtphonon from qt5
compilation, also remove it in this repository.
Change-Id: Iab05e978cc85a6191618faab745ef3a5744d089f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
| |
Change-Id: Ia96fa9e0ba43de4c32053699d0e9528ef308fb67
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: I93b98270168259f954eef68556071c7c9847e29b
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
|
|
Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|