diff options
| author | Tobias Koenig <tobias.koenig@kdab.com> | 2015-07-14 11:08:25 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-08-06 17:01:26 +0000 |
| commit | 6afc4815a1e20f795591ef7d1452a521920ce0bd (patch) | |
| tree | 20ca65920a3d9ca8ee3c3a33bb35693fc0817ba9 | |
| parent | 2d58225ec17d0d4245c89e72ee650ff9a9c53398 (diff) | |
| download | qtquickcontrols-6afc4815a1e20f795591ef7d1452a521920ce0bd.tar.gz | |
Make QtQuickControls compile on WinCE
Add the missing includes and helper functions to make the
QtQuickControls module compile on WinCE
Change-Id: I3c614de295c0db616543953a142d796e58a9a11c
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Gunnar Roth
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 1 | ||||
| -rw-r--r-- | src/controls/Private/qquicktreemodeladaptor.cpp | 2 | ||||
| -rw-r--r-- | src/controls/plugin.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index d683ddf0..55850bf0 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -37,6 +37,7 @@ #include "qquickcontrolsettings_p.h" #include <qquickitem.h> #include <qcoreapplication.h> +#include <qdebug.h> #include <qqmlengine.h> #include <qlibrary.h> #include <qdir.h> diff --git a/src/controls/Private/qquicktreemodeladaptor.cpp b/src/controls/Private/qquicktreemodeladaptor.cpp index dddcdd01..87b2808e 100644 --- a/src/controls/Private/qquicktreemodeladaptor.cpp +++ b/src/controls/Private/qquicktreemodeladaptor.cpp @@ -730,7 +730,7 @@ void QQuickTreeModelAdaptor::dump() const int count = m_items.count(); if (count == 0) return; - int countWidth = floorf(log10f(float(count))) + 1; + int countWidth = floor(log10(double(count))) + 1; qInfo() << "Dumping" << this; for (int i = 0; i < count; i++) { const TreeItem &item = m_items.at(i); diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index e6868569..8ab956c6 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -63,6 +63,7 @@ #endif #ifndef QT_NO_TRANSLATION +#include <QtCore/qcoreapplication.h> #include <QtCore/qlibraryinfo.h> #include <QtCore/qlocale.h> #endif |