diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-08-26 09:25:08 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-08-26 09:27:44 (GMT) |
| commit | dad83c695e968d7c9fb0be2f4636cf14d34fb8a1 (patch) | |
| tree | 4699bdb1a869d6a119e59f17d5217b25e4e504b5 /src/gui/widgets | |
| parent | 796d7cc7dd96cea9875afe2e9cf814e8cb192aa1 (diff) | |
| download | Qt-dad83c695e968d7c9fb0be2f4636cf14d34fb8a1.zip Qt-dad83c695e968d7c9fb0be2f4636cf14d34fb8a1.tar.gz Qt-dad83c695e968d7c9fb0be2f4636cf14d34fb8a1.tar.bz2 | |
fix warnings on Windows CE
Lots of warnings in the qreal == float case.
Some Q_UNUSED added.
Reviewed-by: thartman
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qplaintextedit.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index f0f425f..4734d22 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -368,7 +368,9 @@ QRect QMenuPrivate::actionRect(QAction *act) const return actionRects.at(index); } +#if defined(Q_WS_MAC) static const qreal MenuFadeTimeInSec = 0.150; +#endif void QMenuPrivate::hideUpToMenuBar() { diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp index e025876..4ea18f8 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -379,7 +379,7 @@ void QPlainTextDocumentLayout::layoutBlock(const QTextBlock &block) tl->beginLayout(); qreal availableWidth = d->width; if (availableWidth <= 0) { - availableWidth = INT_MAX; // similar to text edit with pageSize.width == 0 + availableWidth = qreal(INT_MAX); // similar to text edit with pageSize.width == 0 } availableWidth -= 2*margin + extraMargin; while (1) { |