diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-09 06:24:35 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-09 06:24:35 (GMT) |
| commit | 32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba (patch) | |
| tree | 6a33a5221b2f37dfa9782739b0b456cd7496a10b /src/plugins | |
| parent | 120a12f5dc13dea327cdbbbc94b58f29d1f3306b (diff) | |
| parent | f59908d4a6edcd333a156d4c94ddbd9b30f7e810 (diff) | |
| download | Qt-32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba.zip Qt-32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba.tar.gz Qt-32b45ba08745fdcedf6b3537a9f62cd23a5eb1ba.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qpluginbase.pri | 2 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/sqldrivers.pro | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri index a3abc98..b66f8f9 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -1,6 +1,6 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.6.0 + VERSION=4.6.1 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } diff --git a/src/plugins/sqldrivers/sqldrivers.pro b/src/plugins/sqldrivers/sqldrivers.pro index 2bd5f2c..83d71e4 100644 --- a/src/plugins/sqldrivers/sqldrivers.pro +++ b/src/plugins/sqldrivers/sqldrivers.pro @@ -10,6 +10,4 @@ contains(sql-plugins, sqlite) : SUBDIRS += sqlite contains(sql-plugins, sqlite2) : SUBDIRS += sqlite2 contains(sql-plugins, ibase) : SUBDIRS += ibase -contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - symbian:contains(CONFIG, system-sqlite): SUBDIRS += sqlite_symbian - } +symbian:contains(CONFIG, system-sqlite): SUBDIRS += sqlite_symbian |