| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Establish QtAxContainer and QtAxServer as proper modules.
Add QtAxBase as a static helper lib containing
qaxtypefunctions.cpp and qaxutils.cpp from the shared
directory.
qaxtypes.cpp remains in the shared directory as it is
used by both modules with differing defines. The VARIANT
<-> QVariant conversion is exposed via QAxBasePrivate
for testcon.
Add activeqt as a header-only module modeled after
platformheaders.
This makes it easier for the cmake conversion tools.
Task-number: QTBUG-78167
Task-number: QTBUG-27776
Change-Id: I3e7956ea91f2177b8c2596402908351b4d99c510
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
| |
|
|
|
|
|
| |
the CI obtains them from the qt5 super repo nowadays.
Change-Id: Ibc463d79ac92b0fc5ab6cbf5f291eaf077b58a29
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
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: I4da67e288a68fd193cb451c233a2c7c4642d4725
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: I4a192ef6266d3e1a0c2c81679b7fa7a3658ac34c
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The formerly monolithic ActiveQt module has been split into three
modules:
axserver
A static library for creating a server project.
axcontainer
A static libary for creating a container project.
axbase
A static library with shared code for the latter two libraries.
This module also is responsible for the installation of header
files in the include/ActiveQt directory.
"CONFIG += qaxserver" has been deprecated.
Use "QT += axserver" instead.
"CONFIG += qaxcontainer" has been deprecated.
Use "QT += axcontainer" instead.
Code from qaxtypes.cpp that does not depend on the QAX_SERVER define
has been moved to qaxtypefunctions.cpp and resides in the axbase
module.
Task-number: QTBUG-27776
Change-Id: Ib39fc897ccfce16849be0e3c084817d2cd0fc926
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
| |
|
|
|
|
|
|
|
|
| |
generation of the version header, the master header and forwarding
module pris was moved from syncqt to qt_module_config.prf. as we
don't use the latter one due to the untypical module structure, directly
include the "snippets" instead.
Change-Id: I88cf0222d4cc0cae9c77e7134b94922fc808a892
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| |
|
|
|
|
|
|
|
|
| |
%dependencies now has a simpler format of gitmodule => %gitref instead
of using qt modules and keywords.
Change-Id: I785f30e24e0a793218e2e307bdde56067760c518
Reviewed-on: http://codereview.qt.nokia.com/1277
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| | |
|
| |
|
