Remove Symbian specific code from QtSql.
Change-Id: I3fc538862c7334914ec9e4331ef2d3db5c699ea9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>bb10
Xizhi Zhu
Qt by Nokia
parent
04a4b99902
commit
4b3cdc3c1a
|
|
@ -9,5 +9,3 @@ contains(sql-plugins, db2) : SUBDIRS += db2
|
|||
contains(sql-plugins, sqlite) : SUBDIRS += sqlite
|
||||
contains(sql-plugins, sqlite2) : SUBDIRS += sqlite2
|
||||
contains(sql-plugins, ibase) : SUBDIRS += ibase
|
||||
|
||||
symbian:contains(CONFIG, system-sqlite): SUBDIRS += sqlite_symbian
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,52 +0,0 @@
|
|||
# We just want to include the sqlite3 binaries for Symbian for platforms that do not have them.
|
||||
!symbian-abld:!symbian-sbsv2 {
|
||||
!symbian_no_export_sqlite:!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) {
|
||||
contains(QMAKE_HOST.os,Windows) {
|
||||
# Trick on Windows to do a touch on the file, since copy keeps the timestamp.
|
||||
copyWithTouch = copy /y /b NUL+
|
||||
} else {
|
||||
copyWithTouch = "$$QMAKE_COPY "
|
||||
}
|
||||
symbian_sqlite3_zip_file = $$PWD/SQLite3_v9.2.zip
|
||||
|
||||
# The QMAKE_COPY section is to update timestamp on the file.
|
||||
symbian_sqlite3_header.input = symbian_sqlite3_zip_file
|
||||
symbian_sqlite3_header.output = sqlite3.h
|
||||
!isEmpty(MOC_DIR):symbian_sqlite3_header.output = $$MOC_DIR/$$symbian_sqlite3_header.output
|
||||
symbian_sqlite3_header.CONFIG = combine no_link
|
||||
symbian_sqlite3_header.dependency_type = TYPE_C
|
||||
symbian_sqlite3_header.commands = $$QMAKE_UNZIP -j ${QMAKE_FILE_NAME} epoc32/include/stdapis/${QMAKE_FILE_OUT_BASE}.h \
|
||||
&& $${copyWithTouch}${QMAKE_FILE_OUT_BASE}.h ${QMAKE_FILE_OUT}.tmp \
|
||||
&& $$QMAKE_DEL_FILE ${QMAKE_FILE_OUT_BASE}.h \
|
||||
&& $$QMAKE_MOVE ${QMAKE_FILE_OUT}.tmp ${QMAKE_FILE_OUT}
|
||||
silent:symbian_sqlite3_header.commands = @echo unzipping $@ && $$symbian_sqlite3_header.commands
|
||||
QMAKE_EXTRA_COMPILERS += symbian_sqlite3_header
|
||||
|
||||
# The QMAKE_COPY section is to update timestamp on the file.
|
||||
symbian_sqlite3_dso.input = symbian_sqlite3_zip_file
|
||||
symbian_sqlite3_dso.output = sqlite3.dso
|
||||
!isEmpty(OBJECTS_DIR):symbian_sqlite3_dso.output = $$OBJECTS_DIR/$$symbian_sqlite3_dso.output
|
||||
symbian_sqlite3_dso.CONFIG = combine no_link target_predeps
|
||||
symbian_sqlite3_dso.commands = $$QMAKE_UNZIP -j ${QMAKE_FILE_NAME} epoc32/release/armv5/lib/${QMAKE_FILE_OUT_BASE}.dso \
|
||||
&& $${copyWithTouch}${QMAKE_FILE_OUT_BASE}.dso ${QMAKE_FILE_OUT}.tmp \
|
||||
&& $$QMAKE_DEL_FILE ${QMAKE_FILE_OUT_BASE}.dso \
|
||||
&& $$QMAKE_MOVE ${QMAKE_FILE_OUT}.tmp ${QMAKE_FILE_OUT}
|
||||
silent:symbian_sqlite3_dso.commands = @echo unzipping $@ && $$symbian_sqlite3_dso.commands
|
||||
QMAKE_EXTRA_COMPILERS += symbian_sqlite3_dso
|
||||
|
||||
# Workaround for the fact that make doesn't understand that sqlite3.dso
|
||||
# is the same as $OBJECTS_DIR/sqlite3.dso
|
||||
symbian_sqlite3_dso_standalone.target = sqlite3.dso
|
||||
symbian_sqlite3_dso_standalone.depends = $$symbian_sqlite3_dso.output
|
||||
QMAKE_EXTRA_TARGETS += symbian_sqlite3_dso_standalone
|
||||
|
||||
symbian_sqlite3_ver_dso.input = symbian_sqlite3_zip_file
|
||||
symbian_sqlite3_ver_dso.output = sqlite3{00060003}.dso
|
||||
!isEmpty(OBJECTS_DIR):symbian_sqlite3_ver_dso.output = $$OBJECTS_DIR/$$symbian_sqlite3_ver_dso.output
|
||||
symbian_sqlite3_ver_dso.CONFIG = $$symbian_sqlite3_dso.CONFIG
|
||||
symbian_sqlite3_ver_dso.commands = $$symbian_sqlite3_dso.commands
|
||||
QMAKE_EXTRA_COMPILERS += symbian_sqlite3_ver_dso
|
||||
|
||||
QMAKE_LIBDIR *= $$OBJECTS_DIR
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
# Use subdirs template to suppress generation of unnecessary files
|
||||
TEMPLATE = subdirs
|
||||
|
||||
# We just want to export the sqlite3 binaries for Symbian for platforms that do not have them.
|
||||
symbian-abld|symbian-sbsv2 {
|
||||
!symbian_no_export_sqlite:!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) {
|
||||
BLD_INF_RULES.prj_exports += ":zip SQLite3_v9.2.zip"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
HEADERS += $$PWD/qsql_sqlite.h
|
||||
SOURCES += $$PWD/qsql_sqlite.cpp
|
||||
|
||||
symbian:include($$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri)
|
||||
|
||||
!system-sqlite:!contains(LIBS, .*sqlite3.*) {
|
||||
include($$PWD/../../../3rdparty/sqlite.pri)
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -24,14 +24,3 @@ SQL_P = sql
|
|||
include(kernel/kernel.pri)
|
||||
include(drivers/drivers.pri)
|
||||
include(models/models.pri)
|
||||
|
||||
symbian: {
|
||||
TARGET.UID3=0x2001E61D
|
||||
|
||||
# Problems using data exports from this DLL mean that we can't page it on releases that don't support
|
||||
# data exports (currently that's any release before Symbian^3)
|
||||
pagingBlock = "$${LITERAL_HASH}ifndef SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED" \
|
||||
"UNPAGED" \
|
||||
"$${LITERAL_HASH}endif"
|
||||
MMP_RULES += pagingBlock
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue