linssid: build with qt6

This commit is contained in:
Andrew J. Hesford 2023-10-25 15:04:27 -04:00
parent e8356f64c1
commit d64ff43abc
3 changed files with 30 additions and 6 deletions

View file

@ -24,8 +24,9 @@
INCLUDEPATH += /usr/include/qwt
LIBS += -lboost_regex
-LIBS += /usr/lib/libqwt-qt5.so.6
+LIBS += -lqwt
QMAKE_CXXFLAGS += -std=c++11
-QMAKE_CXXFLAGS += -std=c++11
+LIBS += -lqwt-qt6
+QMAKE_CXXFLAGS += -std=c++17
#
TARGET = linssid
-target.path = /usr/sbin

View file

@ -0,0 +1,24 @@
--- ./linssid-app/MainForm.cpp.orig 2023-10-25 14:47:34.411697129 -0400
+++ ./linssid-app/MainForm.cpp 2023-10-25 14:50:20.485975281 -0400
@@ -924,10 +924,10 @@
setData(Qt::DisplayRole, MainForm::cellDataRay[row].cenChan);
MainForm::cellDataRay[row].pTableItem[CENCHAN]->setTextAlignment(Qt::AlignCenter);
MainForm::cellDataRay[row].pTableItem[FIRST_SEEN]->
- setText(QDateTime::fromTime_t(MainForm::cellDataRay[row].firstSeen).toString("MM/dd-hh:mm:ss"));
+ setText(QDateTime::fromSecsSinceEpoch(MainForm::cellDataRay[row].firstSeen).toString("MM/dd-hh:mm:ss"));
MainForm::cellDataRay[row].pTableItem[FIRST_SEEN]->setTextAlignment(Qt::AlignCenter);
MainForm::cellDataRay[row].pTableItem[LAST_SEEN]->
- setText(QDateTime::fromTime_t(MainForm::cellDataRay[row].lastSeen).toString("MM/dd-hh:mm:ss"));
+ setText(QDateTime::fromSecsSinceEpoch(MainForm::cellDataRay[row].lastSeen).toString("MM/dd-hh:mm:ss"));
MainForm::cellDataRay[row].pTableItem[LAST_SEEN]->setTextAlignment(Qt::AlignCenter);
MainForm::cellDataRay[row].pTableItem[VENDOR]->
setText(MainForm::cellDataRay[row].vendor.c_str());
@@ -1127,7 +1127,7 @@
MainForm::cellDataRay[tbi].pTableItem[PLOT]->setFlags(
Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsEditable);
MainForm::cellDataRay[tbi].pTableItem[PLOT]->setCheckState(Qt::Checked);
- MainForm::cellDataRay[tbi].pTableItem[SSID]->setTextColor(MainForm::cellDataRay[tbi].color);
+ MainForm::cellDataRay[tbi].pTableItem[SSID]->setForeground(MainForm::cellDataRay[tbi].color);
}
void MainForm::extractData(string tl, int &tbi, int &newBSS) {

View file

@ -1,11 +1,10 @@
# Template file for 'linssid'
pkgname=linssid
version=3.6
revision=5
revision=6
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="boost-devel qwt-devel"
depends="qt5-svg"
hostmakedepends="qt6-base qt6-tools"
makedepends="boost-devel qwt-qt6-devel"
short_desc="Graphical wireless AP scanner"
maintainer="Piraty <mail@piraty.dev>"
license="GPL-3.0-only"