Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ea4k/klog
Browse files Browse the repository at this point in the history
  • Loading branch information
d authored and d committed Apr 19, 2024
2 parents 4190113 + e68bd86 commit 998d2f8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
5 changes: 4 additions & 1 deletion src/qso.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 4 additions & 4 deletions tests/tst_main/tst_main.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/"
}
}

0 comments on commit 998d2f8

Please sign in to comment.