Skip to content

Commit 48124dc

Browse files
AaronDewesAaronDewes
committed
Fix PINN for QT5 & latest buildroot
Use QT5 features, fix include paths, ...
1 parent 97e9d79 commit 48124dc

30 files changed

+48
-183
lines changed

‎recovery/bootselectiondialog.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <QSettings>
3232
#include <QDesktopWidget>
3333
#include <QScreen>
34-
#include <QWSServer>
34+
// #include <QWSServer>
3535
#include <QRegExp>
3636
#include <QDebug>
3737
#include <QMouseEvent>
@@ -56,7 +56,7 @@ BootSelectionDialog::BootSelectionDialog(
5656
_dsi(dsi),
5757
ui(new Ui::BootSelectionDialog),
5858
_inSelection(false),
59-
_drive(drive.toAscii())
59+
_drive(drive.toLatin1())
6060
{
6161
setWindowFlags(Qt::Window | Qt::CustomizeWindowHint | Qt::WindowTitleHint);
6262
ui->setupUi(this);
@@ -391,7 +391,7 @@ void BootSelectionDialog::updateConfig4dsi(QByteArray partition)
391391
update->setProcessChannelMode(QProcess::MergedChannels);
392392
bool bHDMI=true;
393393
QString status = update->readAll();
394-
QByteArray qba = status.toAscii();
394+
QByteArray qba = status.toLatin1();
395395
const char * result= qba.constData();
396396

397397
if (status.length())

‎recovery/confeditdialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include <QDir>
1717
#include <QFile>
18-
#include <QtGui/QPlainTextEdit>
18+
#include <QPlainTextEdit>
1919
#include <QProcess>
2020
#include <QMessageBox>
2121
#include <unistd.h>
@@ -48,7 +48,7 @@ class ConfEditDialogTab : public QWidget
4848

4949
void save()
5050
{
51-
QByteArray txt = _textEdit->toPlainText().toAscii();
51+
QByteArray txt = _textEdit->toPlainText().toLatin1();
5252

5353
if (!_ro && txt != _origData)
5454
{

‎recovery/input.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <linux/input.h>
3131
#include <linux/uinput.h>
3232

33-
#include <QWSServer>
33+
// #include <QWSServer>
3434
#include <QTimer>
3535
#include <QApplication>
3636
#include <QDesktopWidget>
@@ -407,7 +407,7 @@ void Kinput::key_repeat()
407407
// key press
408408
//sim->inject(EV_KEY, key, 1);
409409
//sim->inject(EV_SYN, SYN_REPORT, 0);
410-
QWSServer::sendKeyEvent(0, currentKey, modifiers, true, false);
410+
// QWSServer::sendKeyEvent(0, currentKey, modifiers, true, false);
411411
}
412412
//QTimer::singleShot( (keyState==1) ? 400 : 100, this, SLOT(key_repeat()));
413413
keytimer.start( (keyState==1) ? 400:100);
@@ -427,7 +427,7 @@ void Kinput::key_repeat()
427427
// key release
428428
//sim->inject(EV_KEY, key, 0);
429429
//sim->inject(EV_SYN, SYN_REPORT, 0);
430-
QWSServer::sendKeyEvent(0, currentKey, modifiers, false, false);
430+
// QWSServer::sendKeyEvent(0, currentKey, modifiers, false, false);
431431
}
432432
currentKey=0;
433433
}

‎recovery/json.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "json.h"
2-
#include <qjson/parser.h>
3-
#include <qjson/serializer.h>
2+
#include <qjson-qt5/parser.h>
3+
#include <qjson-qt5/serializer.h>
44
#include <QDebug>
55
#include <QFile>
66

‎recovery/languagedialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include <QDir>
1717
#include <QLocale>
1818
#include <QKeyEvent>
19-
#include <QWSServer>
20-
#include <QKbdDriverFactory>
19+
// #include <QWSServer>
20+
// #include <QKbdDriverFactory>
2121
#include <QProcess>
2222
#include <QSettings>
2323

‎recovery/mainwindow.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1659,7 +1659,7 @@ void MainWindow::displayMode(int modenr, bool silent)
16591659

16601660
// Refresh screen
16611661
qApp->processEvents();
1662-
QWSServer::instance()->refresh();
1662+
// QWSServer::instance()->refresh();
16631663

16641664
// In case they can't see the message box, inform that mode change
16651665
// is occurring by turning on the LED during the change
@@ -1737,15 +1737,15 @@ bool MainWindow::eventFilter(QObject *, QEvent *event)
17371737
fontsize++;
17381738
QString stylesheet = "* {font-size: "+QString::number(fontsize)+"pt }";
17391739
gApp->setStyleSheet(stylesheet);
1740-
QWSServer::instance()->refresh();
1740+
// QWSServer::instance()->refresh();
17411741
//qDebug() << "Using fontsize "<<fontsize;
17421742
}
17431743
if (keyEvent->key() == Qt::Key_Minus && fontsize >11)
17441744
{
17451745
fontsize--;
17461746
QString stylesheet = "* {font-size: "+QString::number(fontsize)+"pt }";
17471747
gApp->setStyleSheet(stylesheet);
1748-
QWSServer::instance()->refresh();
1748+
// QWSServer::instance()->refresh();
17491749
//qDebug() << "Using fontsize "<<fontsize;
17501750
}
17511751

@@ -2800,7 +2800,7 @@ void MainWindow::downloadMetaComplete()
28002800
QString path = finfo.path() + QString("/error.log");
28012801
QFile f(path);
28022802
f.open(f.Append);
2803-
f.write(error.toAscii());
2803+
f.write(error.toLatin1());
28042804
f.close();
28052805
}
28062806
else

‎recovery/multiimagewritethread.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ QByteArray MultiImageWriteThread::makeLabelUnique(QByteArray label, int maxLabel
625625
{
626626
if (label.size() > maxLabelLen)
627627
{ //restrict to maximum size
628-
label = shorten(label, maxLabelLen).toAscii();
628+
label = shorten(label, maxLabelLen).toLatin1();
629629
}
630630

631631
if (!isLabelAvailable(label, device))
@@ -1114,7 +1114,7 @@ QStringList MultiImageWriteThread::parseQuotedString(const QString &tarfile, int
11141114
int inc=0;
11151115
QChar c = tarfile.at(pos);
11161116

1117-
switch(c.toAscii())
1117+
switch(c.toLatin1())
11181118
{
11191119
case '\"':
11201120
inQuote = 1-inQuote;

‎recovery/optionsdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ void OptionsDialog::write()
276276
QFile f("/mnt/recovery.cmdline");
277277
if (f.open(QIODevice::WriteOnly))
278278
{
279-
f.write(contents.toAscii());
279+
f.write(contents.toLatin1());
280280
f.close();
281281
}
282282
}

‎recovery/passwd.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void Passwd::on_passwordEdit_textChanged(const QString &pass)
3131

3232
QString Passwd::strReverse(QString str)
3333
{
34-
QByteArray ba = str.toAscii();
34+
QByteArray ba = str.toLatin1();
3535
char *d = ba.data();
3636
std::reverse(d, d+str.length());
3737
return QString(d);

‎recovery/recovery.pro

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
#
55
#-------------------------------------------------
66

7-
QT += core gui network dbus
7+
QT += core gui network dbus widgets multimedia
88

9-
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
10-
11-
RPI_USERLAND_DIR=../../staging/usr
9+
RPI_USERLAND_DIR=../../host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr
1210
exists($${RPI_USERLAND_DIR}/include/interface/vmcs_host/vc_cecservice.h) {
1311
INCLUDEPATH += $${RPI_USERLAND_DIR}/include $${RPI_USERLAND_DIR}/include/interface/vcos/pthreads
1412
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) {
2018

2119
TARGET = recovery
2220
TEMPLATE = app
23-
LIBS += -lqjson
21+
LIBS += -lqjson-qt5
2422

2523
system(sh updateqm.sh 2>/dev/null)
2624

‎recovery/translation_ca.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="ca_ES">
3+
<TS version="2.1" language="ca_ES">
44
<context>
55
<name>BackupThread</name>
66
<message>
@@ -651,13 +651,6 @@ WARNING: This will erase all data on your SD card</oldsource>
651651
<source>Clone (c)</source>
652652
<translation type="unfinished"></translation>
653653
</message>
654-
<message>
655-
<location filename="mainwindow.ui" line="583"/>
656-
<location filename="mainwindow.ui" line="649"/>
657-
<location filename="mainwindow.ui" line="694"/>
658-
<source>C</source>
659-
<translation type="unfinished"></translation>
660-
</message>
661654
<message>
662655
<location filename="mainwindow.ui" line="338"/>
663656
<source>Advanced</source>

‎recovery/translation_de.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="de" sourcelanguage="en">
3+
<TS version="2.1" language="de" sourcelanguage="en">
44
<context>
55
<name>BackupThread</name>
66
<message>
@@ -652,13 +652,6 @@ Achtung: Dies löscht alle Ihre Daten auf der SD-Karte</translation>
652652
<source>Clone (c)</source>
653653
<translation>Klonen (c)</translation>
654654
</message>
655-
<message>
656-
<location filename="mainwindow.ui" line="583"/>
657-
<location filename="mainwindow.ui" line="649"/>
658-
<location filename="mainwindow.ui" line="694"/>
659-
<source>C</source>
660-
<translation>C</translation>
661-
</message>
662655
<message>
663656
<location filename="mainwindow.ui" line="338"/>
664657
<source>Advanced</source>

‎recovery/translation_en.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="en_US">
3+
<TS version="2.1" language="en_US">
44
<context>
55
<name>BackupThread</name>
66
<message>
@@ -704,13 +704,6 @@ WARNING: This will erase all data on your SD card</oldsource>
704704
<source>Clone (c)</source>
705705
<translation type="unfinished"></translation>
706706
</message>
707-
<message>
708-
<location filename="mainwindow.ui" line="583"/>
709-
<location filename="mainwindow.ui" line="649"/>
710-
<location filename="mainwindow.ui" line="694"/>
711-
<source>C</source>
712-
<translation type="unfinished"></translation>
713-
</message>
714707
<message>
715708
<location filename="mainwindow.cpp" line="293"/>
716709
<source>Setting up SD card</source>

‎recovery/translation_es.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="es_ES" sourcelanguage="en">
3+
<TS version="2.1" language="es_ES" sourcelanguage="en">
44
<context>
55
<name>BackupThread</name>
66
<message>
@@ -672,13 +672,6 @@ ADVERTENCIA: Esto borrará todos los datos de tu tarjeta SD</translation>
672672
<source>Clone (c)</source>
673673
<translation>Clonar (c)</translation>
674674
</message>
675-
<message>
676-
<location filename="mainwindow.ui" line="583"/>
677-
<location filename="mainwindow.ui" line="649"/>
678-
<location filename="mainwindow.ui" line="694"/>
679-
<source>C</source>
680-
<translation>C</translation>
681-
</message>
682675
<message>
683676
<location filename="mainwindow.ui" line="338"/>
684677
<source>Advanced</source>

‎recovery/translation_eu.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="eu_ES">
3+
<TS version="2.1" language="eu_ES">
44
<context>
55
<name>BackupThread</name>
66
<message>
@@ -656,13 +656,6 @@ KONTUZ: Honek zure SD txarteleko datu guztiak ezabatuko ditu</translation>
656656
<source>Clone (c)</source>
657657
<translation>Klonatu (c)</translation>
658658
</message>
659-
<message>
660-
<location filename="mainwindow.ui" line="583"/>
661-
<location filename="mainwindow.ui" line="649"/>
662-
<location filename="mainwindow.ui" line="694"/>
663-
<source>C</source>
664-
<translation>C</translation>
665-
</message>
666659
<message>
667660
<location filename="mainwindow.ui" line="338"/>
668661
<source>Advanced</source>

‎recovery/translation_fi.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="fi_FI" sourcelanguage="en">
3+
<TS version="2.1" language="fi_FI" sourcelanguage="en">
44
<context>
55
<name>BackupThread</name>
66
<message>
@@ -651,13 +651,6 @@ WARNING: This will erase all data on your SD card</oldsource>
651651
<source>Clone (c)</source>
652652
<translation type="unfinished"></translation>
653653
</message>
654-
<message>
655-
<location filename="mainwindow.ui" line="583"/>
656-
<location filename="mainwindow.ui" line="649"/>
657-
<location filename="mainwindow.ui" line="694"/>
658-
<source>C</source>
659-
<translation type="unfinished"></translation>
660-
</message>
661654
<message>
662655
<location filename="mainwindow.ui" line="338"/>
663656
<source>Advanced</source>

‎recovery/translation_fr.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="fr" sourcelanguage="en">
3+
<TS version="2.1" language="fr" sourcelanguage="en">
44
<context>
55
<name>BackupThread</name>
66
<message>
@@ -652,13 +652,6 @@ WARNING: This will erase all data on your SD card</oldsource>
652652
<source>Clone (c)</source>
653653
<translation>Cloner (c)</translation>
654654
</message>
655-
<message>
656-
<location filename="mainwindow.ui" line="583"/>
657-
<location filename="mainwindow.ui" line="649"/>
658-
<location filename="mainwindow.ui" line="694"/>
659-
<source>C</source>
660-
<translation type="unfinished"></translation>
661-
</message>
662655
<message>
663656
<location filename="mainwindow.ui" line="338"/>
664657
<source>Advanced</source>

‎recovery/translation_hu.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="hu" sourcelanguage="en">
3+
<TS version="2.1" language="hu" sourcelanguage="en">
44
<context>
55
<name>BackupThread</name>
66
<message>
@@ -652,13 +652,6 @@ FIGYELEM: ez letörli az SD kártyát lévő összes adatot</translation>
652652
<source>Clone (c)</source>
653653
<translation type="unfinished"></translation>
654654
</message>
655-
<message>
656-
<location filename="mainwindow.ui" line="583"/>
657-
<location filename="mainwindow.ui" line="649"/>
658-
<location filename="mainwindow.ui" line="694"/>
659-
<source>C</source>
660-
<translation type="unfinished"></translation>
661-
</message>
662655
<message>
663656
<location filename="mainwindow.ui" line="338"/>
664657
<source>Advanced</source>

‎recovery/translation_it.ts

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE TS>
3-
<TS version="2.0" language="it" sourcelanguage="en">
3+
<TS version="2.1" language="it" sourcelanguage="en">
44
<context>
55
<name>BackupThread</name>
66
<message>
@@ -655,13 +655,6 @@ Riformattala usando il programma della SD Association e riprova.</translation>
655655
<source>Clone (c)</source>
656656
<translation>Clona (c)</translation>
657657
</message>
658-
<message>
659-
<location filename="mainwindow.ui" line="583"/>
660-
<location filename="mainwindow.ui" line="649"/>
661-
<location filename="mainwindow.ui" line="694"/>
662-
<source>C</source>
663-
<translation>C</translation>
664-
</message>
665658
<message>
666659
<location filename="mainwindow.ui" line="338"/>
667660
<source>Advanced</source>

0 commit comments

Comments
 (0)