rbutil changes for qt6

Change-Id: I742613b9a99a327c2efecc9ee308a95b1598bbbb
This commit is contained in:
William Wilgus 2024-12-04 23:25:41 -05:00
parent c24862ab64
commit 80c9d71556
3 changed files with 13 additions and 3 deletions

View file

@ -20,7 +20,13 @@ for Rockbox.
Requirements: Requirements:
============= =============
- gcc - gcc
- Qt 5 - Qt 5 or
- Qt 6
- qt6-tools-dev
- qt6-5compat-dev
- qt6-svg-dev
- qt6-multimedia-dev
- at least the following folders from Rockbox tree: - at least the following folders from Rockbox tree:
o lib/rbcodec/codecs/libspeex o lib/rbcodec/codecs/libspeex
o utils/ o utils/
@ -31,12 +37,16 @@ Building:
========= =========
- run cmake in the utils/ folder - run cmake in the utils/ folder
- run make - run make
eg. mkdir utils/build-rbutil ; cd build-rbutil ; cmake ../utils ; make
Build Options: Build Options:
============== ==============
There are no build options to set by the user. If your Qt installation is not There are no build options to set by the user. If your Qt installation is not
in the PATH or a standard search location you might need to set in the PATH or a standard search location you might need to set
CMAKE_PREFIX_PATH to point to it. CMAKE_PREFIX_PATH to point to it.
(*Note this probably has to be done on the command line defining
doesn't appear to work..*)
Installation / Deployment: Installation / Deployment:
========================== ==========================

View file

@ -61,7 +61,7 @@ void SyntaxCompleter::filter(QString text)
{ {
clear(); clear();
for(QMap<QString, QStringList>::iterator i = tags.begin() for(QMultiMap<QString, QStringList>::iterator i = tags.begin()
; i != tags.end(); i++) ; i != tags.end(); i++)
{ {
if(text.length() == 1) if(text.length() == 1)

View file

@ -1018,7 +1018,7 @@ QVariant ParseTreeNode::evalTag(const RBRenderInfo& info, bool conditional,
return QString(); return QString();
if(QString(element->tag->name) == "Sx") if(QString(element->tag->name) == "Sx")
return element->params[0].data.text; return QString(element->params[0].data.text);
return info.device()->data(QString(element->tag->name), return info.device()->data(QString(element->tag->name),
element->params_count, element->params); element->params_count, element->params);
} }