From 07e7bdef28716beada6ab24c156b6c78f405724e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 26 Mar 2026 15:11:34 +0100 Subject: libqmenumodel/src: Fix build errors with Qt6 - Forward declarations of classes without corresponding imports seemed to mess with moc compilation. Switch to importing the corresponding headers, and only add forward-declarations where necessary (with a comment). - Adjust to some Qt constructors that handle char/char* being hidden by explicitly making QChar/QString. --- libqmenumodel/src/ayatanamenumodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libqmenumodel/src/ayatanamenumodel.cpp') diff --git a/libqmenumodel/src/ayatanamenumodel.cpp b/libqmenumodel/src/ayatanamenumodel.cpp index 9ab0ff4..093beaa 100644 --- a/libqmenumodel/src/ayatanamenumodel.cpp +++ b/libqmenumodel/src/ayatanamenumodel.cpp @@ -463,7 +463,7 @@ QVariant AyatanaMenuModel::data(const QModelIndex &index, int role) const ret = gtk_menu_tracker_item_get_attribute (item, "x-canonical-type", "s", &type); if (ret) { - QVariant v(type); + QString v(type); g_free (type); return v; } @@ -658,7 +658,7 @@ static QString qtify_name(const char *name) if (*name == '-') { next_cap = true; } else if (next_cap) { - result.append(toupper(*name)); + result.append(QChar (toupper(*name))); next_cap = false; } else { result.append(*name); -- cgit v1.2.3