Allow building with Qt6, modernize CMakeLists.txt

Author: berolinux

CMakeLists.txt

@@ -1,13 +1,14 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.20)
 project(htmlscript)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_CXX_STANDARD 23)
 
-add_definitions(-std=gnu++14)
+set(QT_VERSION 6 CACHE STRING "Major version of Qt to use (5 and 6 will work, anything else may or may not work)")
 
-find_package(Qt5 COMPONENTS Core Gui Widgets WebEngineWidgets REQUIRED)
+find_package(Qt${QT_VERSION} COMPONENTS Core Gui Widgets WebEngineWidgets REQUIRED)
 add_executable(htmlscript main.cpp Page.cpp)
-qt5_use_modules(htmlscript Core Gui Widgets WebEngineWidgets)
+target_link_libraries(htmlscript Qt${QT_VERSION}::Core Qt${QT_VERSION}::Gui Qt${QT_VERSION}::Widgets Qt${QT_VERSION}::WebEngineWidgets)
 
 install(TARGETS htmlscript DESTINATION bin)

main.cpp

@@ -52,7 +52,7 @@ int main(int argc, char **argv) {
 		startpage = fi.fileName();
 	}
 
-	QWebEngineView *l=new QWebEngineView(0);
+	QWebEngineView *l=new QWebEngineView(static_cast<QWidget*>(nullptr));
 	l->setWindowIcon(QIcon(cl.value(icon)));
 	Page *p=new Page(dir, l);
 	l->setPage(p);