According to QUIP-18 [1], all test files should be
LicenseRef-Qt-Commercial OR GPL-3.0-only
[1]: https://contribute.qt-project.org/quips/18
Pick-to: 6.7
Task-number: QTBUG-121787
Change-Id: I7b5f64b3b261da7a10effe2d91f2c4f058a11e88
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The issues reported on qutlook sample appears to be caused by previous
hardening of the QVariant type, which now does not accept copying
uncopyable types.
The fix to this problem seems to be to be more consistent on use of
pointer types (which are copyable), vs value types generated by the
dumpcpp preprocessor.
In the function VARIANTToQVariant, we may end up in constructing a
wrapper object on top of an IDispatch interface. To be able to construct
an object, we need the value type of the wrapper object. Still, we
should pass it out as a pointer type. This change ensures that a pointer
type is returned if a pointer type was requested.
A second similar issue is fixed in QAxBase::internalInvoke, by passing
(what I assume is) the destination type into VARIANTToQVariant. This
prevents decaying pointer types into value types. I am not sure if this
is the right approach here, and it leaves the decay code behind, which
now might be unused.
Task-number: QTBUG-111191
Pick-to: 6.5 6.6
Change-Id: I0331ee5e3f2dbeed2db45e152378c223feb6fc94
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: Ibdefc58cad3b83d0d117fc333de76ccb5177a621
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
dumpcpp contained an old version of moc code, which is now out
of date. Write out the interface as C++ code and run the real
moc on it to generate this. Some modifications are required.
Remove some asserts that checked on an empty meta object
created in the fallback path of QAxBasePrivate::metaObject()
which was removed by
0bcdc74f55.
Task-number: QTBUG-82945
Change-Id: Ide58bae1440331ea4d5da0fcc74b41f49f09599a
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
- Fix include for QAction after move from widgets to gui in qtbase
- Adapt to OpenGL split
- Skip dumpcpp test for the moment
Change-Id: I8fcec00c56158ee427a9f374b07bb814a99d3bce
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
From Qt 5.7 -> tools & applications are licensed under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one
(in those files which will be under GPL 3 with exceptions)
Change-Id: I28b956229a96fd982b22640226a716c1a4f3aa0d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I2febb46d711c51eeb08f13418a4fc15ab0502f1a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Change copyrights and license headers from Nokia to Digia
Change-Id: I4060147644d7ca34ccff71b3deb30e242b611dab
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Dumpcpp tool still generated revision 1 moc format, so generated code
would no longer compile. Ported relevant revision 7 generation code
from moc tool to dumpcpp tool. Also squashed multiple generated string
tables into a single string table.
QVariant::nameToType(typeName) no longer returns UserType for QVariant,
so fixed few comparisons to take this into account.
Removed warning print from MetaObjectGenerator::addProperty(), as
this just spams warnings unnecessarily when generating properties.
Normally the required metatypes are not registered at time of
generation (e.g. when running dumpcpp tool). Note that the check for
this warning was buggy in Qt4, so it already never printed there.
Added a simple autotest to verify dumpcpp generates working code.
Task-number: QTBUG-26587
Change-Id: If12d2301890c209e7fbcb3bc054791a1c9d492c3
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Lucie Gérard
Jøger Hansegård
Friedemann Kleint
Volker Hilsheimer
Antti Kokko
Jani Heikkinen
Jani Heikkinen
Sergio Ahumada
Iikka Eklund
Miikka Heikkinen