Fixed compilation issues under QT 5.12

Author: foldynl

core/Migration.cpp

@@ -689,7 +689,7 @@ bool Migration::setSelectedProfile(const QString &tablename, const QString &prof
 
     QSqlQuery query;
 
-    if ( !query.prepare(QLatin1String("UPDATE %1 "
+    if ( !query.prepare(QString("UPDATE %1 "
                                       "SET selected = CASE "
                                       "               WHEN profile_name = :profileName THEN 1 "
                                       "               ELSE NULL "

data/Data.cpp

@@ -154,7 +154,7 @@ DxccStatus Data::dxccStatus(int dxcc, const QString &band, const QString &mode)
     }
 
     QSqlQuery query;
-    QString sqlStatement = QLatin1String("WITH all_dxcc_qsos AS (SELECT DISTINCT contacts.mode, contacts.band, "
+    QString sqlStatement = QString("WITH all_dxcc_qsos AS (SELECT DISTINCT contacts.mode, contacts.band, "
                                          "                                       contacts.qsl_rcvd, contacts.lotw_qsl_rcvd "
                                          "                       FROM contacts "
                                          "                       WHERE dxcc = :dxcc %1) "

data/ProfileManager.h

@@ -101,7 +101,7 @@ class ProfileManagerSQL
         QString logging_cat(MOD_NAME); logging_cat.append(".function.entered");
         qCDebug(QLoggingCategory(logging_cat.toLatin1().constData()));
 
-        QSqlQuery query(QLatin1String("SELECT profile_name FROM %1 WHERE IFNULL(selected, 0) = 1").arg(tableName));
+        QSqlQuery query(QString("SELECT profile_name FROM %1 WHERE IFNULL(selected, 0) = 1").arg(tableName));
         currentProfile1 = query.first() ? query.value(0).toString() : QString();
 
         if ( currentProfile1.isEmpty() )
@@ -125,7 +125,7 @@ class ProfileManagerSQL
             QSqlQuery query;
 
             // atomic change
-            if ( !query.prepare(QLatin1String("UPDATE %1 "
+            if ( !query.prepare(QString("UPDATE %1 "
                                               "SET selected = CASE "
                                               "               WHEN profile_name = :profileName THEN 1 "
                                               "               ELSE NULL "

ui/AwardsDialog.cpp

@@ -103,7 +103,7 @@ void AwardsDialog::refreshTable(int)
     if ( ui->paperCheckBox->isChecked() )
         confirmed << " qsl_rcvd = 'Y' ";
 
-    const QString innerConfirmedCase(QLatin1String(" CASE WHEN (%1) THEN 2 ELSE 1 END ").arg(confirmed.join("or")));
+    const QString innerConfirmedCase(QString(" CASE WHEN (%1) THEN 2 ELSE 1 END ").arg(confirmed.join("or")));
 
     for ( const Band& band : dxccBands )
     {
@@ -365,7 +365,12 @@ void AwardsDialog::refreshTable(int)
                                                            tr("TOTAL Worked"),
                                                            uniqColumns,
                                                            stmt_total_padding.join(","),
-                                                           modes.join(","),
+                                                           modes.join(",")
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+                                                           ,
+#else
+                                                           ).arg(
+#endif
                                                            addWherePart,
                                                            tr("TOTAL Confirmed"),
                                                            uniqColumns,
@@ -374,11 +379,16 @@ void AwardsDialog::refreshTable(int)
                                                            modes.join(","),
                                                            addWherePart,
                                                            tr("Confirmed"),
-                                                           stmt_sum_confirmed.join(","),
-                                                           tr("Worked"),
+                                                           stmt_sum_confirmed.join(",")
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+                         ,
+#else
+                                                           ).arg(
+#endif
+                                                           tr("Worked")).arg(
                                                            stmt_sum_worked.join(","),
                                                            stmt_sum_total.join(","),
-                                                           ui->notWorkedCheckBox->isChecked() ? QString("HAVING %1").arg(stmt_having.join(" AND ")) : "" ));
+                                                           ui->notWorkedCheckBox->isChecked() ? QString("HAVING %1").arg(stmt_having.join(" AND ")) : QString() ));
     qDebug(runtime) << finalSQL;
 
     detailedViewModel->setQuery(finalSQL);