From e68bd8675505a26d64764f768efe6d861833b5e9 Mon Sep 17 00:00:00 2001 From: ea4k Date: Thu, 28 Mar 2024 23:31:27 +0100 Subject: [PATCH] Windows fix --- src/qso.cpp | 5 ++++- tests/tst_main/tst_main.pro | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/qso.cpp b/src/qso.cpp index c7b3b758..8ada6cb1 100644 --- a/src/qso.cpp +++ b/src/qso.cpp @@ -2823,18 +2823,21 @@ int QSO::toDB(int _qsoId) { //qDebug() << Q_FUNC_INFO << QString(": QSO ADDED/Modified: %1 - %2").arg(callsign).arg(getDateTimeOn().toString("yyyyMMdd-hhmm")); //qDebug() << Q_FUNC_INFO << ": QSO ADDED/Modified: " << query.lastQuery (); + if (_qsoId>0) + return _qsoId; return 1;//db->getLastInsertedQSO(); } else { //qDebug() << Q_FUNC_INFO << QString(": QSO NOT ADDED/Modified: %1 - %2").arg(callsign).arg(_qsoId); //qDebug() << Q_FUNC_INFO << ": QSO NOT ADDED/Modified: " << query.lastQuery (); - //qDebug() << Q_FUNC_INFO << ": Error: " << query.lastError().databaseText(); + //qDebug() << Q_FUNC_INFO << ": Error: " << query.lastError().baseText(); //qDebug() << Q_FUNC_INFO << ": Error: " << query.lastError().nativeErrorCode(); emit queryError(Q_FUNC_INFO, query.lastError().databaseText(), query.lastError().nativeErrorCode(), query.lastQuery()); return -2; } query.finish(); + return 1; } QString QSO::getAddQueryString() diff --git a/tests/tst_main/tst_main.pro b/tests/tst_main/tst_main.pro index 2a3dea1b..5cc5eeae 100644 --- a/tests/tst_main/tst_main.pro +++ b/tests/tst_main/tst_main.pro @@ -266,7 +266,7 @@ macx: { win32: { message(windows) - RC_ICONS = klog.ico + #RC_ICONS = klog.ico TARGET = klog QMAKE_TARGET_COMPANY = EA4K QMAKE_TARGET_DESCRIPTION = Hamradio logging @@ -278,8 +278,8 @@ win32: { INCLUDEPATH += "$$PWD/../../libs/win32/hamlib/include/" } else { message("64-bit") - LIBS += -L"$$PWD/../../libs/win64/hamlib/lib/gcc" -lhamlib - LIBS += -L"$$PWD/../../libs/win64/hamlib/bin" - INCLUDEPATH += "$$PWD/../../libs/win64/hamlib/include/" + LIBS += -L"$$PWD/../../../libs/win64/hamlib/lib/gcc" -lhamlib + LIBS += -L"$$PWD/../../../libs/win64/hamlib/bin" + INCLUDEPATH += "$$PWD/../../../libs/win64/hamlib/include/" } }