qspatialite: 'update' qt5 port (fixes #19419)

qgis · Jul 15, 2018 · 6551913aa499b02f4b6de1090cd350abe0bce16d · 6551913
1 parent 0c1f89c
commit 6551913aa499b02f4b6de1090cd350abe0bce16d
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -89,6 +89,7 @@ RUN  apt-get update \
     qtpositioning5-dev \
     qttools5-dev \
     qttools5-dev-tools \
+    qtbase5-private-dev \
     saga \
     spawn-fcgi \
     txt2tags \

diff --git a/debian/control.in b/debian/control.in
@@ -21,7 +21,7 @@ Build-Depends:
  libsqlite3-dev,
  libspatialindex-dev,
  libzip-dev,
- qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev, qt5keychain-dev,
+ qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev, qt5keychain-dev, qtbase5-private-dev,
  libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5serialport5-dev, libqt5scintilla2-dev,
  libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
  python3-dev, python3-all-dev, python3-sip, python3-sip-dev,
@@ -40,7 +40,7 @@ Build-Depends:
  xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
 #sid buster bionic cosmic# libosgearth-dev,
 #bionic cosmic# qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
-#oracle# oracle-instantclient12.1-devel, oracle-instantclient12.1-basiclite, qtbase5-private-dev,
+#oracle# oracle-instantclient12.1-devel, oracle-instantclient12.1-basiclite,
  locales, ca-certificates, ninja-build
 Build-Conflicts: libqgis-dev, qgis-dev
 #sid buster stretch xenial bionic cosmic#Standards-Version: 3.9.7

diff --git a/external/qspatialite/CMakeLists.txt b/external/qspatialite/CMakeLists.txt
@@ -6,7 +6,10 @@ ADD_DEFINITIONS(-DQT_PLUGIN)
 ADD_DEFINITIONS(-DQT_NO_DEBUG)
 ADD_DEFINITIONS(-DQT_SHARED)
 
-INCLUDE_DIRECTORIES(SYSTEM ${SQLITE3_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(SYSTEM
+	${SQLITE3_INCLUDE_DIR}
+	${Qt5Sql_PRIVATE_INCLUDE_DIRS}
+)
 
 SET(QSQLSPATIALITE_SRC qsql_spatialite.cpp smain.cpp)
 QT5_WRAP_CPP(QSQLSPATIALITE_SRC qsql_spatialite.h smain.h)