Move QPCSC to digidoc

IB-7927 Signed-off-by: Raul Metsma <raul@metsma.ee>
metsma · Oct 11, 2024 · 65b4588 · 65b4588
1 parent b8cb58c
commit 65b4588
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -120,8 +120,7 @@ else()
 		${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
 		${CMAKE_CURRENT_BINARY_DIR}/config.qrc
 		common/Common.cpp
-		common/Configuration.cpp
-		common/QPCSC.cpp
+        common/Configuration.cpp
 		common/qtsingleapplication/src/qtlocalpeer.cpp
 		common/qtsingleapplication/src/qtsingleapplication.cpp
 	)
@@ -142,7 +141,7 @@ else()
 		NO_CACHE
 	)
 	target_link_libraries(${PROJECT_NAME} Qt6::Widgets Qt6::Network OpenSSL::Crypto
-		msi wintrust Crypt32 taskschd comsupp Setupapi winscard Wtsapi32
+        msi wintrust Crypt32 taskschd comsupp Setupapi Wtsapi32
 	)
 
 	if(CMAKE_SIZEOF_VOID_P EQUAL 8)

diff --git a/common b/common
diff --git a/idupdater.cpp b/idupdater.cpp
@@ -21,7 +21,6 @@
 
 #include "common/Common.h"
 #include "common/Configuration.h"
-#include "common/QPCSC.h"
 
 #include <QDebug>
 #include <QDir>
@@ -105,7 +104,7 @@ idupdater::idupdater( QObject *parent )
 {
 	QString userAgent = QStringLiteral("%1/%2 (%3) Lang: %4 Devices: %5")
 		.arg(QApplication::applicationName(), QApplication::applicationVersion(), Common::applicationOs(),
-			QLocale().uiLanguages().first(), QPCSC::instance().drivers().join('/'));
+            QLocale().uiLanguages().first(), Common::drivers().join('/'));
 	qDebug() << "User-Agent:" << userAgent;
 	request.setRawHeader( "User-Agent", userAgent.toUtf8() );
 	connect(conf, &Configuration::finished, this, &idupdater::finished);
+4 −4		CMakeLists.txt
+58 −0		Common.cpp
+1 −0		Common.h
+1 −2		Configuration.cpp
+0 −486		QPCSC.cpp
+0 −131		QPCSC.h
+0 −207		QPCSC_p.h