@@ -172,7 +172,6 @@ cmake -G Ninja ^
172
172
-D WITH_GLOBE=FALSE ^
173
173
-D WITH_TOUCH=TRUE ^
174
174
-D WITH_ORACLE=TRUE ^
175
- -D WITH_QTWEBKIT=FALSE ^
176
175
-D WITH_CUSTOM_WIDGETS=TRUE ^
177
176
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
178
177
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
@@ -199,6 +198,7 @@ cmake -G Ninja ^
199
198
-D WITH_INTERNAL_MOCK=FALSE ^
200
199
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
201
200
-D WITH_INTERNAL_FUTURE=FALSE ^
201
+ -D WITH_INTERNAL_PYSPATIALITE=TRUE ^
202
202
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT% \apps\Qt5\include\QtCrypto ^
203
203
-D QCA_LIBRARY=%OSGEO4W_ROOT% \apps\Qt5\lib\qca-qt5.lib ^
204
204
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT% \apps\Qt5\lib\qscintilla2.lib ^
@@ -298,13 +298,13 @@ move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
298
298
if errorlevel 1 (echo move of browser executable failed & goto error)
299
299
300
300
if not exist %PKGDIR% \qtplugins\sqldrivers mkdir %PKGDIR% \qtplugins\sqldrivers
301
- move %OSGEO4W_ROOT% \apps\qt4 \plugins\sqldrivers\qsqlocispatial.dll %PKGDIR% \qtplugins\sqldrivers
301
+ move %OSGEO4W_ROOT% \apps\qt5 \plugins\sqldrivers\qsqlocispatial.dll %PKGDIR% \qtplugins\sqldrivers
302
302
if errorlevel 1 (echo move of oci sqldriver failed & goto error)
303
- move %OSGEO4W_ROOT% \apps\qt4 \plugins\sqldrivers\qsqlspatialite.dll %PKGDIR% \qtplugins\sqldrivers
303
+ move %OSGEO4W_ROOT% \apps\qt5 \plugins\sqldrivers\qsqlspatialite.dll %PKGDIR% \qtplugins\sqldrivers
304
304
if errorlevel 1 (echo move of spatialite sqldriver failed & goto error)
305
305
306
306
if not exist %PKGDIR% \qtplugins\designer mkdir %PKGDIR% \qtplugins\designer
307
- move %OSGEO4W_ROOT% \apps\qt4 \plugins\designer\qgis_customwidgets.dll %PKGDIR% \qtplugins\designer
307
+ move %OSGEO4W_ROOT% \apps\qt5 \plugins\designer\qgis_customwidgets.dll %PKGDIR% \qtplugins\designer
308
308
if errorlevel 1 (echo move of customwidgets failed & goto error)
309
309
310
310
if not exist %PKGDIR% \python\PyQt5\uic\widget-plugins mkdir %PKGDIR% \python\PyQt5\uic\widget-plugins
0 commit comments