| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The configure.pri and configure.json files,
originally located in qttools/src/qdoc,
are moved to qttools/global.
This makes the clang environment accessible
to both qdoc and lupdate.
Both files are adapted to the need of the new lupdate clang-based parser.
(see https://wiki.qt.io/Lupdate_clang-based_c%2B%2B_parser#Clang-environment_and_Qt_configuration for details)
Note:
If the clang environment is not adapted to the upcoming lupdate clang-based parser,
nothing will break, the new parser option will simply not be available.
Nothing is changing for qdoc.
Change-Id: I7297f5894ba7aee669865b0e89aaa298b311e07e
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
| |
Clucene got removed completely in 5.9 branch.
Change-Id: I7e0860d6ce7a0e493e8163892745235ccbda74a5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
|
|
|
|
|
| |
the CI obtains them from the qt5 super repo nowadays.
Change-Id: I030c3c28510163bc7c35f82808b3882e68e51857
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
|
|
|
|
|
|
|
|
| |
It has already been removed in qt5.git from the default build, so
we might as well remove it here, too.
Change-Id: I4424fd5ad3aeffc9187615b45db23e1381906191
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
it's backwards to declare the interface as part of the designer library
itself, as that obviously pulls in half of designer itself into custom
widget plugins which should be perfectly usable from the stand-alone
ui loader in uitools. also, designer isn't built for embedded systems,
so the bundling needlessly limited the availability of widget plugins.
so move the relevant headers into a separate include-only module.
the designer module retains forwarding headers, as the old includes
obviously need to continue working.
[ChangeLog][UiTools] Custom widget plugins should now use QT+=uiplugin
instead of QT+=designer. This makes them usable on embedded systems.
Task-number: QTBUG-44724
Change-Id: I5535b10d2f095b257eeda9681f60b2f8c699f7d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I48e7799ba86b95e76270b97bc2eecf2c9d36049f
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: I527d529456fba47fcb4e48c1129612d620878f0a
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: I25e8206d8df8f69ffc5c282487e5d8af22e6b690
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
| |
This module uses QtWebKit APIs, so make sure WebKit is available
when build-testing this module in the CI system.
Change-Id: I41953509cabdfb6306400eb80f6d300ccceaf67b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
| |
5fb5e0dfc7d794df882408d4c7b6c0e14073282b removes qtphonon from qt5
compilation, also remove it in this repository.
Change-Id: I31a3dd4a47bab49039af00b5e385eed61a1cc35c
Reviewed-by: Rohan McGovern <rohan.mcgovern@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)
- pointless QPRO_PWD assignments
- qmake -project boilerplate
Change-Id: I64ce8134c471ccf674b6815878b4090a7eb8d961
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I1ba2a287525556fcdc1c0db5a1ef3ade16c12eda
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ifdfef9222c99b2b71ddb6c579decd1aa09637841
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
| |
sync.profile should not reference modules as dependancies unless they
are actually required; update sync.profile accordingly.
Change-Id: Ic01bf4412cb3407b82311873da3e7a32d1e1846f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Remove duplicate entry for qtscript.
Add missing qtquick1.
Change-Id: Icb81f895fbb5c0f424fed4e988a0307b90562bab
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
sync.profile needs to enumerate indirect dependencies too.
qtdeclarative now depends on qtjsbackend; update sync.profile
accordingly.
Change-Id: Ia6ccda2cfb971b2cd58bd9e2d880c76a5603ad37
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The qt-modularization-base branch of webkit doesn't compile against
post-refactor Qt, and isn't likely to any time soon.
The qtwebkit dependency for qttools is optional, so we'll remove it for
now and test without it until the webkit situation is improved.
Change-Id: I1ed57bd5a91fb7056a3c8daddde33d33a41e72a3
Reviewed-on: http://codereview.qt-project.org/5187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/assistant/help/help.pro
src/designer/src/components/formeditor/formwindow.cpp
src/designer/src/components/formeditor/formwindow_dnditem.cpp
src/designer/src/components/formeditor/layout_propertysheet.cpp
src/designer/src/components/formeditor/qdesigner_resource.cpp
src/designer/src/components/lib/lib.pro
src/designer/src/components/signalsloteditor/signalsloteditor.cpp
src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
src/designer/src/lib/lib.pro
src/designer/src/lib/shared/qdesigner_formbuilder.cpp
src/designer/src/lib/shared/qdesigner_propertysheet.cpp
src/designer/src/lib/shared/shared.pri
src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
src/linguist/lupdate/qdeclarative.cpp
src/linguist/shared/profileevaluator.cpp
src/linguist/shared/qph.cpp
src/linguist/shared/ts.cpp
src/qtconfig/mainwindow.cpp
src/shared/qtgradienteditor/qtcolorline.cpp
src/shared/qtgradienteditor/qtgradientwidget.cpp
sync.profile
Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
And it actually runs! ;-)
Change-Id: I593991e3b5d423189f00d1bd9c51daca6b9e9bd0
Reviewed-on: http://codereview.qt-project.org/4831
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This code used to live in qtbase. It doesn't belong
there however and since there are no dependencies
in qtbase left that require it move it here.
This significantly simplifies the build system with
regards to the code in uilib.
Change-Id: I41c8687bd071a1c253eb55594986f3e1424bc6cf
Reviewed-on: http://codereview.qt-project.org/4830
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Give the source code a somewhat saner structure while
I'm at it.
Change-Id: I99766405debe231a0562dd623ba1d17f19333656
Reviewed-on: http://codereview.qt-project.org/4829
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|/
|
|
|
|
|
|
|
|
| |
%dependencies now has a simpler format of gitmodule => %gitref instead
of using qt modules and keywords.
Change-Id: I785f30e24e0a793218e2e307bdde56067760c510
Reviewed-on: http://codereview.qt.nokia.com/1285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Provide version info for each library.
Task-number: QTMODULARIZATION-44
Reviewed-by: axis
|
| |
|
| |
|
| |
|
| |
|
|
Also make sure that QtHelp can see its own header files from the
syncqted module include path, and include qbase.pri from the
proper location.
|