summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2014-12-09 09:40:40 (GMT)
committerMark Brand <mabrand@mabrand.nl>2014-12-09 09:50:07 (GMT)
commit839eaf513b0068589a531e9a7a5525dc206860bd (patch)
tree2e621e1e5bfbe1632b2f95d98888aeff4a8ffb7c
parent119393a16d5cf96a4e0f54cf88b26eff1ac7354a (diff)
downloadmxe-839eaf513b0068589a531e9a7a5525dc206860bd.zip
mxe-839eaf513b0068589a531e9a7a5525dc206860bd.tar.gz
mxe-839eaf513b0068589a531e9a7a5525dc206860bd.tar.bz2
qtbase: build sql drivers as plugins
Since Qt 5.3.0, static plugin linking is taken care of automaticallly by qmake, which removes the reason for building the sql drivers into QtSql instead of as plugins. For shared builds, plugins is the sensible choice too.
-rw-r--r--src/qtbase.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/qtbase.mk b/src/qtbase.mk
index d71db5d..a03c6d3 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -39,10 +39,10 @@ define $(PKG)_BUILD
-nomake examples \
-nomake tests \
-no-sql-mysql \
- -qt-sql-sqlite \
- -qt-sql-odbc \
- -qt-sql-psql \
- -qt-sql-tds -D Q_USE_SYBASE \
+ -plugin-sql-sqlite \
+ -plugin-sql-odbc \
+ -plugin-sql-psql \
+ -plugin-sql-tds -D Q_USE_SYBASE \
-system-zlib \
-system-libpng \
-system-libjpeg \
@@ -86,5 +86,4 @@ endef
$(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\
- $(subst -qt-sql-,-plugin-sql-,\
$($(PKG)_BUILD)))