lp://qastaging/~neon/qt/qtactiveqt

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

194. By Frederik Gladhorn <email address hidden> on 2015-03-03

Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Ifd323d19d2f8d9f58098f904fe44321327fa9bc8

193. By Jani Heikkinen <email address hidden> on 2015-02-16

Fixed license file headers

Change-Id: Ifb2d18d57602260546cc8a29af221298442575ac
Reviewed-by: Friedemann Kleint <email address hidden>

192. By Frederik Gladhorn <email address hidden> on 2015-02-13

Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ibe92491d7059eb9af7fd7df8a5c5b07ef78f6ac7

191. By Jani Heikkinen <email address hidden> on 2015-02-11

Update copyright headers

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 <email address hidden>

190. By Friedemann Kleint <email address hidden> on 2015-02-02

dumpcpp: Add Q_DECLARE_OPAQUE_POINTER() for referenced types.

Fix errors occurring for forward-declared types in the generated
header like:

qmetatype.h(1354) : error C2027: use of undefined type 'stdole::Font'
        vcgantt.h(26) : see declaration of 'stdole::Font'
        qmetatype.h(1539) : see reference to class template instantiation 'QtPrivate::IsPointerToTypeDerivedFromQObject<T>' being compiled
        with
        [
            T=stdole::Font *
        ]
        qmetatype.h(1546) : see reference to class template instantiation 'QMetaTypeId<T>' being compiled
        with
        [
            T=stdole::Font *
        ]
        \vcgantt.h(33401) : see reference to class template instantiation 'QMetaTypeId2<T>' being compiled
        with
        [
            T=stdole::Font *
        ]
qmetatype.h(1354) : error C2338: Type argument of Q_DECLARE_METATYPE(T*) must be fully defined

Task-number: QTBUG-26587
Change-Id: I9e6c87551b462bc27f94d8e8bd36497075dac8d3
Reviewed-by: Andy Shaw <email address hidden>

189. By Friedemann Kleint <email address hidden> on 2015-02-02

Clean up code dealing with VARIANT.

Initialize arguments before the function call and add checks
for IDispatch ** type variants to clearVARIANT().

Task-number: QTBUG-44048
Change-Id: Idceab05852bca8b0cb7e60672e392ee08a3be594
Reviewed-by: Andy Shaw <email address hidden>

188. By Friedemann Kleint <email address hidden> on 2015-02-02

dumpcpp: Introduce QCommandLineParser.

Task-number: QTBUG-41130
Change-Id: I0ee3668e302e89cb538fafc6eb4bda9d9e05f4ac
Reviewed-by: Joerg Bornemann <email address hidden>

187. By Friedemann Kleint <email address hidden> on 2015-02-02

dumpcpp: Remove unused code.

Remove function generateClass() and unused variable castType.

Change-Id: Iefbb5405e64491b9a9580128c2fa46161c074188
Task-number: QTBUG-41130
Reviewed-by: Joerg Bornemann <email address hidden>

186. By Friedemann Kleint <email address hidden> on 2015-02-02

dumpcpp: Refactor code handling options strings.

Change the type from QByteArray to QString, removing some
conversion code. Move nameSpace option parameter into main
and turn into a QString as well.

Task-number: QTBUG-41130
Change-Id: Ife42f099f725a83e91cc2b73b49cee3fa8c3898b
Reviewed-by: Joerg Bornemann <email address hidden>

185. By Frederik Gladhorn <email address hidden> on 2015-01-19

Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
 .qmake.conf

Change-Id: I4a6ccd88ddb51cbb750d08e6b271089f2edbb8b9