Fix remaining Qt6 build errors after PR #540

- qetxml.h: add missing <QUuid> include (used in propertyUuid/
  createXmlProperty signatures but never included directly).
- machine_info.cpp: fix ambiguous QString/int operator> in
  send_info_to_debug() for it1/it2/it3; just count every
  matching file found instead of the meaningless comparison.
This commit is contained in:
scorpio810
2026-07-17 07:42:34 +00:00
committed by Laurent Trinques
parent 424a1c945e
commit fea4752a06
2 changed files with 4 additions and 9 deletions
+3 -9
View File
@@ -192,10 +192,8 @@ void MachineInfo::send_info_to_debug()
QDirIterator it1(QETApp::commonElementsDir().toLatin1(),nameFilters, QDir::Files, QDirIterator::Subdirectories); QDirIterator it1(QETApp::commonElementsDir().toLatin1(),nameFilters, QDir::Files, QDirIterator::Subdirectories);
while (it1.hasNext()) while (it1.hasNext())
{ {
if(it1.next() > 0 ) it1.next();
{
commomElementsDir ++; commomElementsDir ++;
}
} }
qInfo()<< " Common Elements count:"<< commomElementsDir << "Elements"; qInfo()<< " Common Elements count:"<< commomElementsDir << "Elements";
@@ -204,10 +202,8 @@ void MachineInfo::send_info_to_debug()
QDirIterator it2(QETApp::customElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories); QDirIterator it2(QETApp::customElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories);
while (it2.hasNext()) while (it2.hasNext())
{ {
if(it2.next() > 0 ) it2.next();
{
customElementsDir ++; customElementsDir ++;
}
} }
qInfo()<< " Custom Elements count:"<< customElementsDir << "Elements"; qInfo()<< " Custom Elements count:"<< customElementsDir << "Elements";
@@ -215,10 +211,8 @@ void MachineInfo::send_info_to_debug()
QDirIterator it3(QETApp::companyElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories); QDirIterator it3(QETApp::companyElementsDir().toLatin1(), nameFilters, QDir::Files, QDirIterator::Subdirectories);
while (it3.hasNext()) while (it3.hasNext())
{ {
if(it3.next() > 0 ) it3.next();
{
companyElementsDir ++; companyElementsDir ++;
}
} }
qInfo()<< " Company Elements count:"<< companyElementsDir << "Elements"; qInfo()<< " Company Elements count:"<< companyElementsDir << "Elements";
+1
View File
@@ -20,6 +20,7 @@
#include <QDomElement> #include <QDomElement>
#include <QPen> #include <QPen>
#include <QUuid>
class QDomDocument; class QDomDocument;
class QDir; class QDir;