b612/Proxmark3GUI
1
0
Fork 0
mirror of https://github.com/wh201906/Proxmark3GUI.git synced 2025-02-16 22:21:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make SkipEmptyParts compatible with older Qt

Browse Source 
Fix #25
This commit is contained in:
wh201906 2021-09-21 11:12:42 +08:00
parent f285f76a20
commit c277844cf4
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/lf.cpp
View File

@ -84,7 +84,11 @@ void LF::getLFConfig()
start = result.indexOf(config["field start"].toString()); start = result.indexOf(config["field start"].toString());
end = result.indexOf(config["field end"].toString()); end = result.indexOf(config["field end"].toString());
result = result.mid(start, end - start); result = result.mid(start, end - start);
#if (QT_VERSION <= QT_VERSION_CHECK(5,14,0))
resultList = result.split("\n", QString::SkipEmptyParts);
#else
resultList = result.split("\n", Qt::SkipEmptyParts); resultList = result.split("\n", Qt::SkipEmptyParts);
#endif
qDebug() << "LF CONFIG GET\n" << resultList; qDebug() << "LF CONFIG GET\n" << resultList;
for(auto it = resultList.begin(); it != resultList.end(); it++) for(auto it = resultList.begin(); it != resultList.end(); it++)
{ {

4
ui/mainwindow.cpp
View File

@ -156,7 +156,11 @@ void MainWindow::on_PM3_connectButton_clicked()
#endif #endif
envSetProcess.waitForReadyRead(10000); envSetProcess.waitForReadyRead(10000);
QString envSetResult = QString(envSetProcess.readAll()); QString envSetResult = QString(envSetProcess.readAll());
#if (QT_VERSION <= QT_VERSION_CHECK(5,14,0))
clientEnv = envSetResult.split("\n", QString::SkipEmptyParts); clientEnv = envSetResult.split("\n", QString::SkipEmptyParts);
#else
clientEnv = envSetResult.split("\n", Qt::SkipEmptyParts);
#endif
if(clientEnv.size() > 2) // the first element is "set" and the last element is the current path if(clientEnv.size() > 2) // the first element is "set" and the last element is the current path
{ {
clientEnv.removeFirst(); clientEnv.removeFirst();