diff options
| author | William Wilgus <wilgus.william@gmail.com> | 2024-12-04 23:25:41 -0500 |
|---|---|---|
| committer | William Wilgus <wilgus.william@gmail.com> | 2024-12-04 23:41:48 -0500 |
| commit | 80c9d71556503d09d33a15f3a784eaa900fe48ff (patch) | |
| tree | 8d1068c99b1118b5de23432e380499ec073d2340 | |
| parent | c24862ab6432896d772a0c5fc155035929915c6f (diff) | |
| download | rockbox-80c9d71556.tar.gz rockbox-80c9d71556.zip | |
rbutil changes for qt6
Change-Id: I742613b9a99a327c2efecc9ee308a95b1598bbbb
| -rw-r--r-- | utils/rbutilqt/INSTALL | 12 | ||||
| -rw-r--r-- | utils/themeeditor/gui/syntaxcompleter.cpp | 2 | ||||
| -rw-r--r-- | utils/themeeditor/models/parsetreenode.cpp | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/utils/rbutilqt/INSTALL b/utils/rbutilqt/INSTALL index 81cf748e10..81126950ec 100644 --- a/utils/rbutilqt/INSTALL +++ b/utils/rbutilqt/INSTALL @@ -20,7 +20,13 @@ for Rockbox. Requirements: ============= - 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: o lib/rbcodec/codecs/libspeex o utils/ @@ -31,12 +37,16 @@ Building: ========= - run cmake in the utils/ folder - run make +eg. mkdir utils/build-rbutil ; cd build-rbutil ; cmake ../utils ; make + Build Options: ============== 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 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: ========================== diff --git a/utils/themeeditor/gui/syntaxcompleter.cpp b/utils/themeeditor/gui/syntaxcompleter.cpp index 7019c457c6..3bf53a1d0c 100644 --- a/utils/themeeditor/gui/syntaxcompleter.cpp +++ b/utils/themeeditor/gui/syntaxcompleter.cpp @@ -61,7 +61,7 @@ void SyntaxCompleter::filter(QString text) { clear(); - for(QMap<QString, QStringList>::iterator i = tags.begin() + for(QMultiMap<QString, QStringList>::iterator i = tags.begin() ; i != tags.end(); i++) { if(text.length() == 1) diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index e5cad2ca69..64ff34e5c4 100644 --- a/utils/themeeditor/models/parsetreenode.cpp +++ b/utils/themeeditor/models/parsetreenode.cpp @@ -1018,7 +1018,7 @@ QVariant ParseTreeNode::evalTag(const RBRenderInfo& info, bool conditional, return QString(); 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), element->params_count, element->params); } |