diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 11:00:02 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 10:31:31 +0200 |
| commit | 5ddcd47dbdab9710a547244d29fe038bde3d8c98 (patch) | |
| tree | fb6176ee512708eabc01cbe43f557c4d306e8c82 /src/qtquick1/graphicsitems | |
| parent | 8f72ef77d1f37b46583deed532951c6b0e5937ae (diff) | |
Declarative: Fix MSVC and g++ warnings
Potentially severe:
- Fix int/bool mismatches
- Use of uninitialized variable
- Do connectionMask shift operations in 64bit
- Enum type mismatch for QLineControl::EchoMode
Various:
- class/struct mismatches
- UnhandledEnumeration values
- Unused variables
- Constructor initialization order
Change-Id: Ieb52f8990445fe95f94070175a0f9beb66863240
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qtquick1/graphicsitems')
| -rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativetextinput.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp b/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp index 3a36e6b070..009c72a4cd 100644 --- a/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp @@ -1392,7 +1392,8 @@ QVariant QDeclarative1TextInput::inputMethodQuery(Qt::InputMethodQuery property) case Qt::ImCursorPosition: return QVariant(d->control->cursor()); case Qt::ImSurroundingText: - if (d->control->echoMode() == PasswordEchoOnEdit && !d->control->passwordEchoEditing()) + if (d->control->echoMode() == QLineControl::PasswordEchoOnEdit + && !d->control->passwordEchoEditing()) return QVariant(displayText()); else return QVariant(text()); |