diff options
| author | mread <qt-info@nokia.com> | 2010-06-30 14:00:11 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-07-01 08:34:47 (GMT) |
| commit | fabf804b147892abb0e8aeb49d1753359ea5e56e (patch) | |
| tree | ea9d514be08bc64e2848b0a7d1e87f8eaf0a0709 /src/3rdparty/webkit | |
| parent | cb2b4a12ac17adf56074d3630efe4feb50ae0e2b (diff) | |
| download | Qt-fabf804b147892abb0e8aeb49d1753359ea5e56e.zip Qt-fabf804b147892abb0e8aeb49d1753359ea5e56e.tar.gz Qt-fabf804b147892abb0e8aeb49d1753359ea5e56e.tar.bz2 | |
Avkon removal configured with -no-s60
Avkon dependencies can be configured out with the -no-s60 configure
flag, conversely Qt on Symbian will use Avkon if -s60 is configured.
These changes are intended to keep or introduce binary compatibility
between the s60 and no-s60 configurations. To do this, it has been
necessary to introduce stub equivalents of the CAknAppUi related
classes into the no-s60 configuration, and override all Avkon framework
virtual functions in the QS60Main... classes.
Other than that, these changes are mostly just correcting the use of
the Q_WS_S60 flag so that it only refers to Avkon dependencies.
Reviewed-by: Sami Merila
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 9a4e9b2..dc12881 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -3614,7 +3614,7 @@ QString QWebPage::userAgentForUrl(const QUrl&) const firstPartTemp += QString::fromLatin1("Sun Solaris"); #elif defined Q_OS_ULTRIX firstPartTemp += QString::fromLatin1("DEC Ultrix"); -#elif defined Q_WS_S60 +#elif defined Q_OS_SYMBIAN firstPartTemp += QLatin1Char(' '); QSysInfo::S60Version s60Version = QSysInfo::s60Version(); switch (s60Version) { |