From 4b3cdc3c1ab990f9be4c9ce134324076c01b35b0 Mon Sep 17 00:00:00 2001 From: Xizhi Zhu Date: Sun, 22 Jan 2012 16:34:40 +0100 Subject: Remove Symbian specific code from QtSql. Change-Id: I3fc538862c7334914ec9e4331ef2d3db5c699ea9 Reviewed-by: Lars Knoll --- src/plugins/sqldrivers/sqldrivers.pro | 2 - .../sqldrivers/sqlite_symbian/SQLite3_v9.2.zip | Bin 3119273 -> 0 bytes .../sqldrivers/sqlite_symbian/sqlite_symbian.pri | 52 --------------------- .../sqldrivers/sqlite_symbian/sqlite_symbian.pro | 9 ---- src/sql/drivers/sqlite/qsql_sqlite.pri | 2 - src/sql/sql.pro | 11 ----- 6 files changed, 76 deletions(-) delete mode 100644 src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip delete mode 100644 src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri delete mode 100644 src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro diff --git a/src/plugins/sqldrivers/sqldrivers.pro b/src/plugins/sqldrivers/sqldrivers.pro index 83d71e48f2..39c58d4f2b 100644 --- a/src/plugins/sqldrivers/sqldrivers.pro +++ b/src/plugins/sqldrivers/sqldrivers.pro @@ -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 diff --git a/src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip b/src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip deleted file mode 100644 index df7864410a..0000000000 Binary files a/src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip and /dev/null differ diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri deleted file mode 100644 index b7a87f38d8..0000000000 --- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri +++ /dev/null @@ -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 - } -} diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro deleted file mode 100644 index 0d233e6d43..0000000000 --- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro +++ /dev/null @@ -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" - } -} diff --git a/src/sql/drivers/sqlite/qsql_sqlite.pri b/src/sql/drivers/sqlite/qsql_sqlite.pri index 78a4e49979..7ad5936e25 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.pri +++ b/src/sql/drivers/sqlite/qsql_sqlite.pri @@ -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 { diff --git a/src/sql/sql.pro b/src/sql/sql.pro index 445946e07c..dbeed14386 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -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 -} -- cgit v1.2.3