Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit 88b7fc3

Browse files
committed
[Qt] Implement mapbox::sqlite::{Database,Statement} using QtSql
1 parent eb77225 commit 88b7fc3

File tree

8 files changed

+444
-22
lines changed

8 files changed

+444
-22
lines changed

cmake/test-files.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ set(MBGL_TEST_FILES
6868
test/storage/offline_download.test.cpp
6969
test/storage/online_file_source.test.cpp
7070
test/storage/resource.test.cpp
71+
test/storage/sqlite.test.cpp
7172

7273
# style/conversion
7374
test/style/conversion/function.test.cpp

platform/qt/config.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ macro(mbgl_platform_core)
2323
PRIVATE platform/qt/include
2424
)
2525

26-
target_add_mason_package(mbgl-core PRIVATE sqlite)
27-
2826
target_link_libraries(mbgl-core
2927
${MBGL_QT_LIBRARIES}
3028
)

platform/qt/qt.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ set(MBGL_QT_FILES
2525
PRIVATE platform/default/mbgl/storage/offline_database.hpp
2626
PRIVATE platform/default/mbgl/storage/offline_download.cpp
2727
PRIVATE platform/default/mbgl/storage/offline_download.hpp
28-
PRIVATE platform/default/sqlite3.cpp
2928
PRIVATE platform/default/sqlite3.hpp
3029

3130
# Misc
@@ -45,6 +44,7 @@ set(MBGL_QT_FILES
4544
PRIVATE platform/qt/src/image.cpp
4645
PRIVATE platform/qt/src/run_loop.cpp
4746
PRIVATE platform/qt/src/run_loop_impl.hpp
47+
PRIVATE platform/qt/src/sqlite3.cpp
4848
PRIVATE platform/qt/src/string_stdlib.cpp
4949
PRIVATE platform/qt/src/timer.cpp
5050
PRIVATE platform/qt/src/timer_impl.hpp

platform/qt/qt4.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set(MBGL_QT_LIBRARIES
55
PRIVATE Qt4::QtGui
66
PRIVATE Qt4::QtNetwork
77
PRIVATE Qt4::QtOpenGL
8+
PRIVATE Qt4::QtSql
89
)
910

1011
target_link_libraries(qmapboxgl

platform/qt/qt5.cmake

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ find_package(Qt5Network REQUIRED)
55
find_package(Qt5OpenGL REQUIRED)
66
find_package(Qt5Quick REQUIRED)
77
find_package(Qt5Widgets REQUIRED)
8+
find_package(Qt5Sql REQUIRED)
89

910
set(MBGL_QT_LIBRARIES
1011
PRIVATE Qt5::Core
@@ -13,6 +14,7 @@ set(MBGL_QT_LIBRARIES
1314
PRIVATE Qt5::Network
1415
PRIVATE Qt5::OpenGL
1516
PRIVATE Qt5::Quick
17+
PRIVATE Qt5::Sql
1618
)
1719

1820
target_sources(qmapboxgl
@@ -31,6 +33,7 @@ target_link_libraries(qmapboxgl
3133
PRIVATE Qt5::Location
3234
PRIVATE Qt5::OpenGL
3335
PRIVATE Qt5::Quick
36+
PRIVATE Qt5::Sql
3437
)
3538

3639
target_link_libraries(mbgl-qt

0 commit comments

Comments
 (0)