diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-22 20:28:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-22 20:28:12 (GMT) |
| commit | 618aa624538eb0f591cfa817e1520bc8810792c7 (patch) | |
| tree | 863106d3c65c23d373cbe8cc05ea152e33145a9d /src | |
| parent | 3d9f5b56f1c26c2bccedae04eb9536fed3474d43 (diff) | |
| parent | 77bd18e7636a65c3a3be5e8e912484e8dc5fee02 (diff) | |
| download | Qt-618aa624538eb0f591cfa817e1520bc8810792c7.zip Qt-618aa624538eb0f591cfa817e1520bc8810792c7.tar.gz Qt-618aa624538eb0f591cfa817e1520bc8810792c7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added silent behavior to the most important Symbian build steps.
Fixed compiling with symbian/linux-armcc and configure -silent option
Removed some warnings from armcc that are unneeded.
Made the makefile build system use QMAKE_CFLAGS.xxx properly.
Automatically disabled unsupported modules for certain compilers.
Fixed an incorrect profile inclusion.
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri | 2 | ||||
| -rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.pri | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri index ab8d846..494c64c 100644 --- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri +++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri @@ -13,6 +13,7 @@ && $$QMAKE_COPY ${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. @@ -24,6 +25,7 @@ && $$QMAKE_COPY ${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 symbian_sqlite3_ver_dso.input = symbian_sqlite3_zip_file diff --git a/src/sql/drivers/sqlite/qsql_sqlite.pri b/src/sql/drivers/sqlite/qsql_sqlite.pri index 3560c64..78a4e49 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.pri +++ b/src/sql/drivers/sqlite/qsql_sqlite.pri @@ -1,7 +1,7 @@ HEADERS += $$PWD/qsql_sqlite.h SOURCES += $$PWD/qsql_sqlite.cpp -symbian:include(../../plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri) +symbian:include($$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri) !system-sqlite:!contains(LIBS, .*sqlite3.*) { include($$PWD/../../../3rdparty/sqlite.pri) |