diff options
| author | Tasuku Suzuki <tasuku.suzuki@qbc.io> | 2019-07-05 07:52:08 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@qbc.io> | 2019-08-19 01:51:32 +0900 |
| commit | c00487d588f9ae45d8a477a1c436fde69feca782 (patch) | |
| tree | 4fa52ecc1622bdd139ebadbf31dc76b15e4a9593 | |
| parent | 99749d3b05326f139656e1393cbb227e967b4c54 (diff) | |
Fix build without features.dlopen
Change-Id: I4ad24c241d3c32a5658bf71fa6133181793020d3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/3rdparty/sqlite.pri | 6 | ||||
| -rw-r--r-- | src/gui/configure.json | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index 6405beb3d0..cc8c12a6da 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri @@ -9,7 +9,11 @@ winrt { } qnx: DEFINES += _QNX_SOURCE !win32:!winrt:!winphone: DEFINES += HAVE_USLEEP=1 -qtConfig(dlopen): QMAKE_USE += libdl +qtConfig(dlopen) { + QMAKE_USE += libdl +} else { + DEFINES += SQLITE_OMIT_LOAD_EXTENSION +} integrity: QMAKE_CFLAGS += -include qplatformdefs.h INCLUDEPATH += $$PWD/sqlite SOURCES += $$PWD/sqlite/sqlite3.c diff --git a/src/gui/configure.json b/src/gui/configure.json index 81b6ebbb84..c2793bf236 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1,7 +1,7 @@ { "module": "gui", "depends": [ - "core", + "core-private", "network" ], "testDir": "../../config.tests", @@ -1375,7 +1375,7 @@ }, "egl": { "label": "EGL", - "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl)", + "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix)", "output": [ "privateFeature", "feature" ] }, "egl_x11": { |