Don't use qmlRegisterType with QT-5.14
ClosedPublic
Actions

Authored by plevine on Nov 30 2019, 5:37 AM.

Details

Reviewers

jriddell
davidedmundson

Group Reviewers

Plasma

Commits

R258:92ffa670f0e5: Don't use qmlRegisterType with QT-5.14

Summary

Building Plymouth-kcm-5.17.3 against Qt 5.14.0_beta3 fails to build.

I don't have much experience with QT/KDE programming but these
changes are sufficient to fix the build error on my end.

BUG: 414679

Diff Detail

Lint

Lint Skipped

Unit

Unit Tests Skipped

plevine created this revision.Nov 30 2019, 5:37 AM

Restricted Application added a project: Plasma. · View Herald TranscriptNov 30 2019, 5:37 AM

Restricted Application added a subscriber: plasma-devel. · View Herald Transcript

plevine requested review of this revision.Nov 30 2019, 5:37 AM

ngraham added a reviewer: Plasma.Nov 30 2019, 5:45 AM

asturmlechner added a subscriber: asturmlechner.Nov 30 2019, 9:27 AM

You'll find this with the other repos too.

In general I've been reverting the relevant path of the cmake that forces no deprecated.

This revision is now accepted and ready to land.Nov 30 2019, 11:27 AM

zzag added a subscriber: zzag.Nov 30 2019, 12:31 PM

zzag added inline comments.

src/kcm.cpp
55	You could use `QT_VERSION_CHECK` to make the code more readable, e.g. #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) qmlRegisterType<QStandardItemModel>(); qmlRegisterType<KCMPlymouth>(); #else qmlRegisterAnonymousType<QStandardItemModel>("KCMPlymouth", 1); qmlRegisterAnonymousType<KCMPlymouth>("KCMPlymouth", 1); #endif

src/kcm.cpp

You could use QT_VERSION_CHECK to make the code more readable, e.g.

#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
    qmlRegisterType<QStandardItemModel>();
    qmlRegisterType<KCMPlymouth>();
#else
    qmlRegisterAnonymousType<QStandardItemModel>("KCMPlymouth", 1);
    qmlRegisterAnonymousType<KCMPlymouth>("KCMPlymouth", 1);
#endif

Use QT_VERSION_CHECK for clarity.

ngraham edited the summary of this revision. (Show Details)Dec 26 2019, 8:13 PM

Closed by commit R258:92ffa670f0e5: Don't use qmlRegisterType with QT-5.14 (authored by plevine, committed by ngraham). · Explain WhyDec 26 2019, 8:18 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			src/kcm.cpp (6 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	70596			Nov 30 2019, 4:40 AM	★	★
Diff 2	70645			Nov 30 2019, 11:59 PM	★	★
Diff 3	72221	10f1e7c	R258:92ffa670f0e51ed949c34fd14c7773a4ad2d0946	Dec 26 2019, 8:16 PM	★	★

Diff 70645

View Options