On Tuesday 05 February 2013 11:33:29 Paul Olav Tvete wrote:
> To see the changes, check out (or diff against) the
> "wip/android" branch.
Looking at the patch with git diff origin/dev...origin/wip/android
[not very convenient for commenting on code changes...]
I see changes that are unrelated to android:
--- a/src/corelib/codecs/qiconvcodec_p.h
+++ b/src/corelib/codecs/qiconvcodec_p.h
@@ -55,7 +55,7 @@
#include "qtextcodec.h"
-#if defined(Q_OS_UNIX) && !defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED)
+#if (defined(Q_OS_UNIX) || defined(__MINGW32__)) && !defined(QT_NO_ICONV) &&
!defined(QT_BOOTSTRAPPED)
#ifdef Q_OS_MAC
typedef void * iconv_t;
This adds MINGW !?
+ if (d->goToSleep.testAndSetAcquire(1,1)) // don't go to bed if someone
just woked you up !
Typo :-) woked -> woke
--- a/src/gui/kernel/qplatforminputcontext.cpp
+++ b/src/gui/kernel/qplatforminputcontext.cpp
@@ -114,7 +114,7 @@ void QPlatformInputContext::commit()
/*!
Notification on editor updates. Called by QInputMethod::update().
*/
-void QPlatformInputContext::update(Qt::InputMethodQueries)
+void QPlatformInputContext::update(Qt::InputMethodQueries queries)
{
}
Well, this is just bogus, it creates a compiler warning.
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -156,7 +156,12 @@ QString QTextBrowserPrivate::findFile(const QUrl &name)
const
else if (name.scheme().isEmpty())
fileName = name.path();
else
- fileName = name.toLocalFile();
+ {
+ if (name.scheme() == QLatin1String("assets"))
+ fileName = QLatin1String("assets:") + name.path();
Urgh. This is a pretty broken way to construct a URL. Think of a path with a
'#' in it...
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -1119,6 +1119,11 @@ void QAbstractButton::mouseReleaseEvent(QMouseEvent *e)
return;
}
+#ifdef Q_OS_ANDROID
+ d->repeatTimer.stop();
+ d->click();
+ e->accept();
+#else
Urgh, I thought we didn't want OS-specific defines in widgets anymore, after the
whole QPA re-architecture. Didn't we get rid of such Q_WS_X11 hacks on purpose?
--
David Faure | david.fa...@kdab.com | Managing Director KDAB France
KDAB (France) S.A.S., a KDAB Group company
Tel. France +33 (0)4 90 84 08 53, Sweden (HQ) +46-563-540090
KDAB - Qt Experts - Platform-independent software solutions
_______________________________________________
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development
