From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 13 May 2011 16:23:25 +0100
Subject: Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
---
 Tools/QtTestBrowser/locationedit.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Tools/QtTestBrowser/locationedit.cpp')

diff --git a/Tools/QtTestBrowser/locationedit.cpp b/Tools/QtTestBrowser/locationedit.cpp
index a97f148..85bd222 100644
--- a/Tools/QtTestBrowser/locationedit.cpp
+++ b/Tools/QtTestBrowser/locationedit.cpp
@@ -27,6 +27,8 @@
 
 #include "locationedit.h"
 
+#ifndef QT_NO_INPUTDIALOG
+
 LocationEdit::LocationEdit(QWidget* parent)
     : QLineEdit(parent)
     , m_progress(0)
@@ -78,3 +80,5 @@ void LocationEdit::focusInEvent(QFocusEvent* ev)
     QTimer::singleShot(0, this, SLOT(selectAll()));
 #endif
 }
+
+#endif
-- 
cgit v1.1