QLineControl: Fix compilation, warnings.

Change-Id: I6a2d2f24b13961e8dc113366f62402824d80e1c2
Reviewed-on: http://codereview.qt.nokia.com/1365
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/gui/text/qlinecontrol.cpp b/src/gui/text/qlinecontrol.cpp
index 4d5912f..36c064e 100644 (file)
--- a/src/gui/text/qlinecontrol.cpp
+++ b/src/gui/text/qlinecontrol.cpp
@@ -660,7 +660,9 @@ void QLineControl::internalSetText(const QString &txt, int pos, bool edited)
     m_cursor = (pos < 0 || pos > m_text.length()) ? m_text.length() : pos;
     m_textDirty = (oldText != m_text);
 
-#ifndef QT_NO_ACCESSIBILITY
+#ifdef QT_NO_ACCESSIBILITY
+    Q_UNUSED(edited)
+#else
     bool changed = finishChange(-1, true, edited);
     if (changed)
         QAccessible::updateAccessibility(parent(), 0, QAccessible::TextUpdated);

diff --git a/src/gui/text/qlinecontrol_p.h b/src/gui/text/qlinecontrol_p.h
index d3db94e..e5435c2 100644 (file)
--- a/src/gui/text/qlinecontrol_p.h
+++ b/src/gui/text/qlinecontrol_p.h
@@ -60,6 +60,7 @@
 #include "QtGui/qclipboard.h"
 #include "QtGui/qvalidator.h"
 #include "QtGui/qpalette.h"
+#include "QtGui/qguiapplication.h"
 #include "QtCore/qpoint.h"
 
 QT_BEGIN_HEADER