diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-07-18 09:16:47 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-18 10:35:46 (GMT) |
| commit | 41cf7a76bb3924f4ee4553c93a213dda754fdc15 (patch) | |
| tree | 28062041b1971f568b0296570a1b1885aee99bd7 /tools | |
| parent | 5210d47aa66214e3cb16f394d0510a91f770c1b1 (diff) | |
| download | Qt-41cf7a76bb3924f4ee4553c93a213dda754fdc15.zip Qt-41cf7a76bb3924f4ee4553c93a213dda754fdc15.tar.gz Qt-41cf7a76bb3924f4ee4553c93a213dda754fdc15.tar.bz2 | |
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.
cherry-picked from qt5/qtbase: a94e917eeb7b19eb19c3cf74d71a9b4cabfb1124
Change-Id: Iccf4e403a90e85b41c70895e1c91fe2d8f0eb573
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index cbf20f4..50c7c66 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2231,10 +2231,15 @@ 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") { - // Symbian has multiple .lib/.dll files we need to find - if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) { - available = true; // There is sqlite_symbian plugin which exports the necessary stuff - dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3"; + if (dictionary.contains("XQMAKESPEC")) { + // Symbian has multiple .lib/.dll files we need to find + if (dictionary["XQMAKESPEC"].startsWith("symbian")) { + available = true; // There is sqlite_symbian plugin which exports the necessary stuff + dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3"; + } else if (dictionary["XQMAKESPEC"].endsWith("qcc")) { + available = true; + dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3 -lz"; + } } else { available = findFile("sqlite3.h") && findFile("sqlite3.lib"); if (available) |