File tree Expand file tree Collapse file tree 3 files changed +16
-15
lines changed
Expand file tree Collapse file tree 3 files changed +16
-15
lines changed Original file line number Diff line number Diff line change @@ -184,6 +184,10 @@ set(MM_HDRS
184184 mmstyle.h
185185)
186186
187+ if (NOT WIN32 )
188+ set (MM_SRCS ${MM_SRCS} static_plugins.cpp)
189+ endif ()
190+
187191if (HAVE_BLUETOOTH)
188192 set (MM_SRCS ${MM_SRCS} position/providers/bluetoothpositionprovider.cpp)
189193
@@ -524,20 +528,15 @@ endif ()
524528target_link_libraries (
525529 MerginMaps
526530 PUBLIC Qt6Keychain::Qt6Keychain
527- qca
528- GDAL::GDAL
529- PostgreSQL::PostgreSQL
530- Spatialite::Spatialite
531- )
532-
533- if (NOT WIN32 )
534- target_link_libraries (
535- MerginMaps
536- PUBLIC ${QCA_OSSL_PLUGIN_LIB}
531+ qca
532+ GDAL::GDAL
533+ PostgreSQL::PostgreSQL
534+ Spatialite::Spatialite
537535)
538- endif ()
539-
540536
537+ if (NOT WIN32 )
538+ target_link_libraries (MerginMaps PUBLIC ${QCA_OSSL_PLUGIN_LIB} )
539+ endif ()
541540
542541target_link_libraries (
543542 MerginMaps
Original file line number Diff line number Diff line change 156156#include " qgsapplication.h"
157157#include " activeproject.h"
158158#include " appsettings.h"
159- // required for QGIS authentication manager API
160- #include < QtPlugin>
161- Q_IMPORT_PLUGIN ( opensslPlugin )
162159
163160static QString getDataDir ()
164161{
@@ -402,6 +399,8 @@ void addQmlImportPath( QQmlEngine &engine )
402399
403400int main ( int argc, char *argv[] )
404401{
402+ // for windows qca dll
403+ QCoreApplication::addLibraryPath ( QCoreApplication::applicationDirPath () );
405404 QgsApplication app ( argc, argv, true );
406405
407406 const QString version = CoreUtils::appVersion ();
Original file line number Diff line number Diff line change 1+ #include < QtPlugin>
2+ // Required for QGIS authentication manager API on static builds (Linux/macOS/iOS)
3+ Q_IMPORT_PLUGIN ( opensslPlugin )
You can’t perform that action at this time.
0 commit comments