Fix PINN for QT5 & latest buildroot

Use QT5 features, fix include paths, ...
procount · Aug 22, 2020 · 48124dc · 48124dc
1 parent 97e9d79
commit 48124dc
Show file tree

Hide file tree

Showing 30 changed files with 48 additions and 183 deletions.
diff --git a/recovery/bootselectiondialog.cpp b/recovery/bootselectiondialog.cpp
@@ -31,7 +31,7 @@
 #include <QSettings>
 #include <QDesktopWidget>
 #include <QScreen>
-#include <QWSServer>
+// #include <QWSServer>
 #include <QRegExp>
 #include <QDebug>
 #include <QMouseEvent>
@@ -56,7 +56,7 @@ BootSelectionDialog::BootSelectionDialog(
     _dsi(dsi),
     ui(new Ui::BootSelectionDialog),
     _inSelection(false),
-    _drive(drive.toAscii())
+    _drive(drive.toLatin1())
 {
     setWindowFlags(Qt::Window | Qt::CustomizeWindowHint | Qt::WindowTitleHint);
     ui->setupUi(this);
@@ -391,7 +391,7 @@ void BootSelectionDialog::updateConfig4dsi(QByteArray partition)
     update->setProcessChannelMode(QProcess::MergedChannels);
     bool bHDMI=true;
     QString status = update->readAll();
-    QByteArray qba = status.toAscii();
+    QByteArray qba = status.toLatin1();
     const char * result= qba.constData();
 
     if (status.length())

diff --git a/recovery/confeditdialog.cpp b/recovery/confeditdialog.cpp
@@ -15,7 +15,7 @@
 
 #include <QDir>
 #include <QFile>
-#include <QtGui/QPlainTextEdit>
+#include <QPlainTextEdit>
 #include <QProcess>
 #include <QMessageBox>
 #include <unistd.h>
@@ -48,7 +48,7 @@ class ConfEditDialogTab : public QWidget
 
     void save()
     {
-        QByteArray txt = _textEdit->toPlainText().toAscii();
+        QByteArray txt = _textEdit->toPlainText().toLatin1();
 
         if (!_ro && txt != _origData)
         {

diff --git a/recovery/input.cpp b/recovery/input.cpp
@@ -30,7 +30,7 @@
 #include <linux/input.h>
 #include <linux/uinput.h>
 
-#include <QWSServer>
+// #include <QWSServer>
 #include <QTimer>
 #include <QApplication>
 #include <QDesktopWidget>
@@ -407,7 +407,7 @@ void Kinput::key_repeat()
             // key press
             //sim->inject(EV_KEY, key, 1);
             //sim->inject(EV_SYN, SYN_REPORT, 0);
-            QWSServer::sendKeyEvent(0, currentKey, modifiers, true, false);
+            // QWSServer::sendKeyEvent(0, currentKey, modifiers, true, false);
         }
         //QTimer::singleShot( (keyState==1) ? 400 : 100, this, SLOT(key_repeat()));
         keytimer.start( (keyState==1) ? 400:100);
@@ -427,7 +427,7 @@ void Kinput::key_repeat()
                 // key release
                 //sim->inject(EV_KEY, key, 0);
                 //sim->inject(EV_SYN, SYN_REPORT, 0);
-                QWSServer::sendKeyEvent(0, currentKey, modifiers, false, false);
+                // QWSServer::sendKeyEvent(0, currentKey, modifiers, false, false);
             }
             currentKey=0;
         }

diff --git a/recovery/json.cpp b/recovery/json.cpp
@@ -1,6 +1,6 @@
 #include "json.h"
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
+#include <qjson-qt5/parser.h>
+#include <qjson-qt5/serializer.h>
 #include <QDebug>
 #include <QFile>
 

diff --git a/recovery/languagedialog.cpp b/recovery/languagedialog.cpp
@@ -16,8 +16,8 @@
 #include <QDir>
 #include <QLocale>
 #include <QKeyEvent>
-#include <QWSServer>
-#include <QKbdDriverFactory>
+// #include <QWSServer>
+// #include <QKbdDriverFactory>
 #include <QProcess>
 #include <QSettings>
 

diff --git a/recovery/mainwindow.cpp b/recovery/mainwindow.cpp
@@ -1659,7 +1659,7 @@ void MainWindow::displayMode(int modenr, bool silent)
 
     // Refresh screen
     qApp->processEvents();
-    QWSServer::instance()->refresh();
+    // QWSServer::instance()->refresh();
 
     // In case they can't see the message box, inform that mode change
     // is occurring by turning on the LED during the change
@@ -1737,15 +1737,15 @@ bool MainWindow::eventFilter(QObject *, QEvent *event)
             fontsize++;
             QString stylesheet = "* {font-size: "+QString::number(fontsize)+"pt }";
             gApp->setStyleSheet(stylesheet);
-            QWSServer::instance()->refresh();
+            // QWSServer::instance()->refresh();
             //qDebug() << "Using fontsize "<<fontsize;
         }
         if (keyEvent->key() == Qt::Key_Minus && fontsize >11)
         {
             fontsize--;
             QString stylesheet = "* {font-size: "+QString::number(fontsize)+"pt }";
             gApp->setStyleSheet(stylesheet);
-            QWSServer::instance()->refresh();
+            // QWSServer::instance()->refresh();
             //qDebug() << "Using fontsize "<<fontsize;
         }
 
@@ -2800,7 +2800,7 @@ void MainWindow::downloadMetaComplete()
                 QString path = finfo.path() + QString("/error.log");
                 QFile f(path);
                 f.open(f.Append);
-                f.write(error.toAscii());
+                f.write(error.toLatin1());
                 f.close();
             }
             else

diff --git a/recovery/multiimagewritethread.cpp b/recovery/multiimagewritethread.cpp
@@ -625,7 +625,7 @@ QByteArray MultiImageWriteThread::makeLabelUnique(QByteArray label, int maxLabel
     {
         if (label.size() > maxLabelLen)
         {   //restrict to maximum size
-            label = shorten(label, maxLabelLen).toAscii();
+            label = shorten(label, maxLabelLen).toLatin1();
         }
 
         if (!isLabelAvailable(label, device))
@@ -1114,7 +1114,7 @@ QStringList MultiImageWriteThread::parseQuotedString(const QString &tarfile, int
         int inc=0;
         QChar c = tarfile.at(pos);
 
-        switch(c.toAscii())
+        switch(c.toLatin1())
         {
         case '\"':
             inQuote = 1-inQuote;

diff --git a/recovery/optionsdialog.cpp b/recovery/optionsdialog.cpp
@@ -276,7 +276,7 @@ void OptionsDialog::write()
     QFile f("/mnt/recovery.cmdline");
     if (f.open(QIODevice::WriteOnly))
     {
-        f.write(contents.toAscii());
+        f.write(contents.toLatin1());
         f.close();
     }
 }

diff --git a/recovery/passwd.cpp b/recovery/passwd.cpp
@@ -31,7 +31,7 @@ void Passwd::on_passwordEdit_textChanged(const QString &pass)
 
 QString Passwd::strReverse(QString str)
 {
-    QByteArray ba = str.toAscii();
+    QByteArray ba = str.toLatin1();
     char *d = ba.data();
     std::reverse(d, d+str.length());
     return QString(d);

diff --git a/recovery/recovery.pro b/recovery/recovery.pro
@@ -4,11 +4,9 @@
 #
 #-------------------------------------------------
 
-QT       += core gui network dbus
+QT       += core gui network dbus widgets multimedia
 
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-RPI_USERLAND_DIR=../../staging/usr
+RPI_USERLAND_DIR=../../host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr
 exists($${RPI_USERLAND_DIR}/include/interface/vmcs_host/vc_cecservice.h) {
     INCLUDEPATH += $${RPI_USERLAND_DIR}/include $${RPI_USERLAND_DIR}/include/interface/vcos/pthreads
     LIBS += -lbcm_host -lvcos -lvchiq_arm -lvchostif -L$${RPI_USERLAND_DIR}/lib -lrt -ldl
@@ -20,7 +18,7 @@ exists($${RPI_USERLAND_DIR}/include/interface/vmcs_host/vc_cecservice.h) {
 
 TARGET = recovery
 TEMPLATE = app
-LIBS += -lqjson 
+LIBS += -lqjson-qt5
 
 system(sh updateqm.sh 2>/dev/null)
 

diff --git a/recovery/translation_ca.ts b/recovery/translation_ca.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ca_ES">
+<TS version="2.1" language="ca_ES">
 <context>
     <name>BackupThread</name>
     <message>
@@ -651,13 +651,6 @@ WARNING: This will erase all data on your SD card</oldsource>
         <source>Clone (c)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwindow.ui" line="583"/>
-        <location filename="mainwindow.ui" line="649"/>
-        <location filename="mainwindow.ui" line="694"/>
-        <source>C</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwindow.ui" line="338"/>
         <source>Advanced</source>

diff --git a/recovery/translation_de.ts b/recovery/translation_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de" sourcelanguage="en">
+<TS version="2.1" language="de" sourcelanguage="en">
 <context>
     <name>BackupThread</name>
     <message>
@@ -652,13 +652,6 @@ Achtung: Dies löscht alle Ihre Daten auf der SD-Karte</translation>
         <source>Clone (c)</source>
         <translation>Klonen (c)</translation>
     </message>
-    <message>
-        <location filename="mainwindow.ui" line="583"/>
-        <location filename="mainwindow.ui" line="649"/>
-        <location filename="mainwindow.ui" line="694"/>
-        <source>C</source>
-        <translation>C</translation>
-    </message>
     <message>
         <location filename="mainwindow.ui" line="338"/>
         <source>Advanced</source>

diff --git a/recovery/translation_en.ts b/recovery/translation_en.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
+<TS version="2.1" language="en_US">
 <context>
     <name>BackupThread</name>
     <message>
@@ -704,13 +704,6 @@ WARNING: This will erase all data on your SD card</oldsource>
         <source>Clone (c)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwindow.ui" line="583"/>
-        <location filename="mainwindow.ui" line="649"/>
-        <location filename="mainwindow.ui" line="694"/>
-        <source>C</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwindow.cpp" line="293"/>
         <source>Setting up SD card</source>

diff --git a/recovery/translation_es.ts b/recovery/translation_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES" sourcelanguage="en">
+<TS version="2.1" language="es_ES" sourcelanguage="en">
 <context>
     <name>BackupThread</name>
     <message>
@@ -672,13 +672,6 @@ ADVERTENCIA: Esto borrará todos los datos de tu tarjeta SD</translation>
         <source>Clone (c)</source>
         <translation>Clonar (c)</translation>
     </message>
-    <message>
-        <location filename="mainwindow.ui" line="583"/>
-        <location filename="mainwindow.ui" line="649"/>
-        <location filename="mainwindow.ui" line="694"/>
-        <source>C</source>
-        <translation>C</translation>
-    </message>
     <message>
         <location filename="mainwindow.ui" line="338"/>
         <source>Advanced</source>

diff --git a/recovery/translation_eu.ts b/recovery/translation_eu.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="eu_ES">
+<TS version="2.1" language="eu_ES">
 <context>
     <name>BackupThread</name>
     <message>
@@ -656,13 +656,6 @@ KONTUZ: Honek zure SD txarteleko datu guztiak ezabatuko ditu</translation>
         <source>Clone (c)</source>
         <translation>Klonatu (c)</translation>
     </message>
-    <message>
-        <location filename="mainwindow.ui" line="583"/>
-        <location filename="mainwindow.ui" line="649"/>
-        <location filename="mainwindow.ui" line="694"/>
-        <source>C</source>
-        <translation>C</translation>
-    </message>
     <message>
         <location filename="mainwindow.ui" line="338"/>
         <source>Advanced</source>

diff --git a/recovery/translation_fi.ts b/recovery/translation_fi.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fi_FI" sourcelanguage="en">
+<TS version="2.1" language="fi_FI" sourcelanguage="en">
 <context>
     <name>BackupThread</name>
     <message>
@@ -651,13 +651,6 @@ WARNING: This will erase all data on your SD card</oldsource>
         <source>Clone (c)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwindow.ui" line="583"/>
-        <location filename="mainwindow.ui" line="649"/>
-        <location filename="mainwindow.ui" line="694"/>
-        <source>C</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwindow.ui" line="338"/>
         <source>Advanced</source>

diff --git a/recovery/translation_fr.ts b/recovery/translation_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr" sourcelanguage="en">
+<TS version="2.1" language="fr" sourcelanguage="en">
 <context>
     <name>BackupThread</name>
     <message>
@@ -652,13 +652,6 @@ WARNING: This will erase all data on your SD card</oldsource>
         <source>Clone (c)</source>
         <translation>Cloner (c)</translation>
     </message>
-    <message>
-        <location filename="mainwindow.ui" line="583"/>
-        <location filename="mainwindow.ui" line="649"/>
-        <location filename="mainwindow.ui" line="694"/>
-        <source>C</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwindow.ui" line="338"/>
         <source>Advanced</source>

diff --git a/recovery/translation_hu.ts b/recovery/translation_hu.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="hu" sourcelanguage="en">
+<TS version="2.1" language="hu" sourcelanguage="en">
 <context>
     <name>BackupThread</name>
     <message>
@@ -652,13 +652,6 @@ FIGYELEM: ez letörli az SD kártyát lévő összes adatot</translation>
         <source>Clone (c)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwindow.ui" line="583"/>
-        <location filename="mainwindow.ui" line="649"/>
-        <location filename="mainwindow.ui" line="694"/>
-        <source>C</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwindow.ui" line="338"/>
         <source>Advanced</source>

diff --git a/recovery/translation_it.ts b/recovery/translation_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="it" sourcelanguage="en">
+<TS version="2.1" language="it" sourcelanguage="en">
 <context>
     <name>BackupThread</name>
     <message>
@@ -655,13 +655,6 @@ Riformattala usando il programma della SD Association e riprova.</translation>
         <source>Clone (c)</source>
         <translation>Clona (c)</translation>
     </message>
-    <message>
-        <location filename="mainwindow.ui" line="583"/>
-        <location filename="mainwindow.ui" line="649"/>
-        <location filename="mainwindow.ui" line="694"/>
-        <source>C</source>
-        <translation>C</translation>
-    </message>
     <message>
         <location filename="mainwindow.ui" line="338"/>
         <source>Advanced</source>