diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-07-17 11:52:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-17 15:56:15 +0200 |
| commit | a94e917eeb7b19eb19c3cf74d71a9b4cabfb1124 (patch) | |
| tree | 42760f683d651893bd8022021cc2d633be010eab /tools | |
| parent | fe4adec894a8294516cd6aa02c5cbae2e7d8e8db (diff) | |
Set correct QT_LFLAGS_SQLITE for default cases.
In systems where no pkgconfig is available, such as QNX, we set
QT_LFLAGS_SQLITE to the default values.
Change-Id: I24edd589ce7baf2614480a91842ca756ead39463
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 63d8b7d291..153be04ee6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2010,11 +2010,17 @@ bool Configure::checkAvailability(const QString &part) available = true; // Built in, we have a fork else if (part == "SQL_SQLITE_LIB") { if (dictionary[ "SQL_SQLITE_LIB" ] == "system") { - available = findFile("sqlite3.h") && findFile("sqlite3.lib"); - if (available) - dictionary[ "QT_LFLAGS_SQLITE" ] += "sqlite3.lib"; - } else + if ((platform() == QNX) || (platform() == BLACKBERRY)) { + available = true; + dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3 -lz"; + } else { + available = findFile("sqlite3.h") && findFile("sqlite3.lib"); + if (available) + dictionary[ "QT_LFLAGS_SQLITE" ] += "sqlite3.lib"; + } + } else { available = true; + } } else if (part == "SQL_SQLITE2") available = findFile("sqlite.h") && findFile("sqlite.lib"); else if (part == "SQL_IBASE") |