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>
Events were not generated to IDL files for signals of activeQt servers,
because QMetaMethod::typeName() now properly returns "void" instead of
empty stringfor methods with void return type. The same issue was
present in few other places in code, so fixed those as well.
Also fixed incorrect use of return type instead of parameter type
where signal paremeters were converted to event parameters in
QAxServerBase::qt_metacall(). Previously this bug has gone unnoticed as
"type" has typically been empty in this case, which does the default
conversion based on QVariant type.
Task-number: QTBUG-26411
Change-Id: I3684805bc900d3cad6fbcc8ccabbb3ecac120092
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
A recently added optional QRect parameter for QWidget::grab()
caused a build failure in most ActiveQt examples.
Optional parameters apparently need to use VARIANT type in .idl file,
but the parameter replacement logic didn't account for struct keyword,
which is what QRect parameters get in earlier type conversion.
Fixed similarly to the enum case.
Note that QRect parameters don't seem to work at all even in 4.8,
so this is simply a compile fix at this point.
Task-number: QTBUG-25955
Change-Id: Ic1a2a2e69d5b9b34e4a2e1199275b961fe82d2c8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
1) Due to changes to metaobjects, QAxBase::qt_static_metacall has
replaced a direct qt_metacall use in ActiveQt. The qt_static_metacall
function offsets the method id, which seems to be necessary when slots
are invoked via Qt, but breaks when invocation comes via COM interface.
Fixed by correcting the offset where necessary.
2) In MetaObjectGenerator::metaObject() function (qaxbase.cpp), the
assert Q_ASSERT(!typeName.isEmpty()) is wrong, as empty typename is a
valid result here. Removed the assert.
3) The type_map in qaxserver.cpp needs "void" -> "void" mapping, as
QMetaMethod::typeName() no longer returns empty string for void.
Task-number: QTBUG-25804
Change-Id: I53fcae5ac3134b7da85ff2ab2e93f01460da7583
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
QMetaMethod::signature() has been renamed to methodSignature(),
and it now returns a QByteArray.
The (internal) QMetaObject::d::stringdata member is now of type
const QByteArrayData *. Use reinterpret_cast to keep it compiling
until ActiveQt's meta-object generator has been ported to the new
meta-object format (revision 7).
Change-Id: Iba6e867f719eae9f72b78d3cd206f27ae13d1328
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Some types were being registered in multiple places in different ways.
This patch tries to ensure that types are preferentially registered in
the canonical qRegisterMetaType<T>(#T) form.
Where this is not possible, we first check whether the type is already
registered, and only then attempt aliasing to void*/QObject*.
Hid away IsPointerToTypeDerivedFromQObject monstruosity, as QtCore now
provides a macro for this purpose.
Change-Id: I564b6ad3cd14daed9452d85a775c980f5772c703
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: I82638e41d9adc9180fef26a5548f775399afafb2
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:
http://qt.gitorious.org/qt/pages/GitIntroductionWithQt
If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.
Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12
Sergio Ahumada
Friedemann Kleint
Iikka Eklund
Miikka Heikkinen
Bill King
Kent Hansen
João Abecasis
Jason McDonald
Qt by Nokia