diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Tools/QtTestBrowser/locationedit.cpp | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Tools/QtTestBrowser/locationedit.cpp')
| -rw-r--r-- | Tools/QtTestBrowser/locationedit.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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 |