Fix Qt compatibility and VM script docs
Updates desktop shell and application code for cross-Qt compatibility: uses begin/endFilterChange for Qt 6.10+, gates LayerShell usage to Qt < 6.5, and adds include handling for generated QML type registration files so nebula-shell builds reliably. Also fixes qInfo size formatting casts and updates README commands to invoke run-sway-vm.sh via `sh` for more portable execution.
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
#include "ApplicationFilterModel.hpp"
|
||||
#include "ApplicationModel.hpp"
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
ApplicationFilterModel::ApplicationFilterModel(QObject *parent)
|
||||
: QSortFilterProxyModel(parent)
|
||||
{
|
||||
@@ -25,7 +27,12 @@ void ApplicationFilterModel::setFilter(const QString &filter)
|
||||
return;
|
||||
|
||||
m_filter = trimmed;
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
|
||||
beginFilterChange();
|
||||
endFilterChange();
|
||||
#else
|
||||
invalidateFilter();
|
||||
#endif
|
||||
emit filterChanged();
|
||||
emit countChanged();
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ void ApplicationService::refresh()
|
||||
|
||||
const QStringList directories = applicationDirectories();
|
||||
qInfo("nebula: scanning %d application director%s",
|
||||
directories.size(),
|
||||
int(directories.size()),
|
||||
directories.size() == 1 ? "y" : "ies");
|
||||
|
||||
for (const QString &directory : directories) {
|
||||
@@ -103,7 +103,7 @@ void ApplicationService::refresh()
|
||||
}
|
||||
|
||||
qInfo("nebula: discovered %d launcher application%s",
|
||||
entries.size(),
|
||||
int(entries.size()),
|
||||
entries.size() == 1 ? "" : "s");
|
||||
m_model->setEntries(std::move(entries));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user