Qt6 / c++17 changes.

Steven de Ridder
1 parent cb1cc3f7
Showing 4 changed files with 8 additions and 6 deletions
CMakeLists.txt
src/CMakeLists.txt
src/dbconnector.cpp
src/dbconnector.h
@@ -24,6 +24,8 @@ endif()
  
 # ==============================================================================
  
+set(CMAKE_CXX_STANDARD 17)
+
 include(projectheader)
 project_header(osdev_dbconnector)
  
@@ -25,12 +25,12 @@ endif()
 include(projectheader)
 project_header(dbconnector)
  
-find_package( Qt5Core REQUIRED )
-find_package( Qt5Sql REQUIRED )
+find_package( Qt6Core REQUIRED )
+find_package( Qt6Sql REQUIRED )
  
 include_directories( SYSTEM
-    ${Qt5Core_INCLUDE_DIRS}
-    ${Qt5Sql_INCLUDE_DIRS}
+    ${Qt6Core_INCLUDE_DIRS}
+    ${Qt6Sql_INCLUDE_DIRS}
 )
  
 include(compiler)
@@ -509,7 +509,7 @@ bool DbConnector::recordsExist( const QString&amp; sTable, const QString&amp; sField, co
     {
         valueList.append(this->toSqlValueString(v));
     }
-    QStringList uniqueValueList = valueList.toSet().toList();
+    QStringList uniqueValueList = valueList.toList();
     auto queryResult = this->executeQuery(countQuery
                                             .arg(this->quoteTableName(sTable))
                                             .arg(this->quoteFieldName(sField))
@@ -38,7 +38,7 @@
  
 class QSqlQuery;
 class QString;
-class QStringList;
+//class QStringList;
 template<class K, class V> class QHash;
 class QSqlDatabase;