This repository was archived by the owner on Aug 8, 2023. It is now read-only.
Commit 88b7fc3 1 parent eb77225 commit 88b7fc3 Copy full SHA for 88b7fc3
File tree 8 files changed +444
-22
lines changed
8 files changed +444
-22
lines changed Original file line number Diff line number Diff line change @@ -68,6 +68,7 @@ set(MBGL_TEST_FILES
68
68
test /storage/offline_download.test .cpp
69
69
test /storage/online_file_source.test .cpp
70
70
test /storage/resource .test .cpp
71
+ test /storage/sqlite.test .cpp
71
72
72
73
# style/conversion
73
74
test /style/conversion/function.test .cpp
Original file line number Diff line number Diff line change @@ -23,8 +23,6 @@ macro(mbgl_platform_core)
23
23
PRIVATE platform/qt/include
24
24
)
25
25
26
- target_add_mason_package(mbgl-core PRIVATE sqlite)
27
-
28
26
target_link_libraries (mbgl-core
29
27
${MBGL_QT_LIBRARIES}
30
28
)
Original file line number Diff line number Diff line change @@ -25,7 +25,6 @@ set(MBGL_QT_FILES
25
25
PRIVATE platform/default/mbgl/storage/offline_database.hpp
26
26
PRIVATE platform/default/mbgl/storage/offline_download.cpp
27
27
PRIVATE platform/default/mbgl/storage/offline_download.hpp
28
- PRIVATE platform/default/sqlite3.cpp
29
28
PRIVATE platform/default/sqlite3.hpp
30
29
31
30
# Misc
@@ -45,6 +44,7 @@ set(MBGL_QT_FILES
45
44
PRIVATE platform/qt/src/image.cpp
46
45
PRIVATE platform/qt/src/run_loop.cpp
47
46
PRIVATE platform/qt/src/run_loop_impl.hpp
47
+ PRIVATE platform/qt/src/sqlite3.cpp
48
48
PRIVATE platform/qt/src/string_stdlib.cpp
49
49
PRIVATE platform/qt/src/timer.cpp
50
50
PRIVATE platform/qt/src/timer_impl.hpp
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ set(MBGL_QT_LIBRARIES
5
5
PRIVATE Qt4::QtGui
6
6
PRIVATE Qt4::QtNetwork
7
7
PRIVATE Qt4::QtOpenGL
8
+ PRIVATE Qt4::QtSql
8
9
)
9
10
10
11
target_link_libraries (qmapboxgl
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ find_package(Qt5Network REQUIRED)
5
5
find_package (Qt5OpenGL REQUIRED)
6
6
find_package (Qt5Quick REQUIRED)
7
7
find_package (Qt5Widgets REQUIRED)
8
+ find_package (Qt5Sql REQUIRED)
8
9
9
10
set (MBGL_QT_LIBRARIES
10
11
PRIVATE Qt5::Core
@@ -13,6 +14,7 @@ set(MBGL_QT_LIBRARIES
13
14
PRIVATE Qt5::Network
14
15
PRIVATE Qt5::OpenGL
15
16
PRIVATE Qt5::Quick
17
+ PRIVATE Qt5::Sql
16
18
)
17
19
18
20
target_sources (qmapboxgl
@@ -31,6 +33,7 @@ target_link_libraries(qmapboxgl
31
33
PRIVATE Qt5::Location
32
34
PRIVATE Qt5::OpenGL
33
35
PRIVATE Qt5::Quick
36
+ PRIVATE Qt5::Sql
34
37
)
35
38
36
39
target_link_libraries (mbgl-qt
You can’t perform that action at this time.
0 commit comments