Pointer to a pointer (**) type parameters didn't get namespace
prepended to them.
Task-number: QTBUG-28383
Change-Id: I9379fecfad5814b897af7757d0b7b650b31d01e1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Instead of writing vast amounts of data into a QByteArray, we're using
a temporary file as clipboard. This enables us to handle much larger
import tables without worrying about running out of RAM.
Task-number: QTBUG-28325
Change-Id: Ied9567651cd859400ba3ed9a45cbbaac603300b6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
All qax_* functions that return QMetaObject instances actually return
instances of QAxMetaObject. To make sure that ~QAxMetaObject is
called, we introduce the qax_deleteMetaObject function and call it in
the appropriate places.
The explicit call to QByteArray::detach is needed because the
affected QMetaObject/Method calls return a QByteArray that directly
holds a pointer to the QByteArrayData contained in QAxMetaObject.
Once the QAxMetaObject is destroyed, the QByteArray objects will hold
pointers to freed memory. Therefore we make a deep copy of the
QByteArray by detaching it.
Task-number: QTBUG-28325
Change-Id: I97613f12f1a30608dd5acd67d0faebb3f39cdf70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>
QMetaType private API was changed therefore the dumper tool has to be
upgraded.
Change-Id: Ibf200b71a7b12a4c011dd9ce426439ad1eec62dc
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.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>
Changes in QMetaMethod::typeName() return value caused functions
that return void to incorrectly generate return statments in dumpcpp.
Task-number: QTBUG-26587
Change-Id: Id0abea96234a0a75cab8b53473cfee7e60846499
Reviewed-by: Kent Hansen <kent.hansen@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>
qMetaTypeConstructHelper(const T*) is a private api which was changed to
qMetaTypeCreateHelper(const void*).
Change-Id: I81e434cef9b1f15eadcb6e2f2d28eb979274ed64
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@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>
Comment out Some functionality for the moment.
Change-Id: Ia7d1d3ba982e97776ae7259be06689b5477450a1
Reviewed-on: http://codereview.qt-project.org/5972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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
Miikka Heikkinen
Joerg Bornemann
Friedemann Kleint
Oswald Buddenhagen
Jędrzej Nowacki
Iikka Eklund
Friedemann Kleint
Kent Hansen
Jędrzej Nowacki
Jason McDonald
Jyri Tahtela
Qt by Nokia