Merge branch 'master' of github.com:xxxcucus/planes

xxxcucus · Mar 21, 2024 · 8559ec5 · 8559ec5
2 parents 6b667ac + 007dd3c
commit 8559ec5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/c_plus_plus/CMakeLists.txt b/c_plus_plus/CMakeLists.txt
@@ -154,10 +154,10 @@ if (UNIX)
 	install(DIRECTORY ${ROOT_PATH}/qml/QtQuick/Window DESTINATION bin/QtQuick/)	
 	install(DIRECTORY ${ROOT_PATH}/qml/QtQml DESTINATION bin)
 
-	install(FILES $ENV{OPENSSL_HOME}/libcrypto.so.1.1 DESTINATION lib)
-	install(FILES $ENV{OPENSSL_HOME}/libssl.so.1.1 DESTINATION  lib)
-	install(FILES $ENV{OPENSSL_HOME}/libcrypto.so DESTINATION lib)
-	install(FILES $ENV{OPENSSL_HOME}/libssl.so DESTINATION  lib)
+	install(FILES $ENV{OPENSSL_HOME}/libcrypto.so.3 DESTINATION lib)
+	install(FILES $ENV{OPENSSL_HOME}/libssl.so.3 DESTINATION  lib)
+	#install(FILES $ENV{OPENSSL_HOME}/libcrypto.so DESTINATION lib)
+	#install(FILES $ENV{OPENSSL_HOME}/libssl.so DESTINATION  lib)
 
 
 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/PlanesWidget.sh PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ DESTINATION .)

diff --git a/c_plus_plus/PlanesGraphicsScene/main.cpp b/c_plus_plus/PlanesGraphicsScene/main.cpp
@@ -18,6 +18,8 @@
     msgBox.exec();
     bool isMultiplayer = msgBox.clickedButton() == multiplayerButton;
 
+    qDebug() << "SSL version" << QSslSocket::supportsSsl() << QSslSocket::sslLibraryBuildVersionString() << QSslSocket::sslLibraryVersionString();
+
     //constructs and shows the program main window
     PlanesGSWindow *planesWindow = new PlanesGSWindow(isMultiplayer);
     planesWindow->show();