diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri | |
parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri')
-rw-r--r-- | src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri | 52 |
1 files changed, 0 insertions, 52 deletions
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 - } -} |