Changeset 87724 in webkit

Timestamp:

May 31, 2011 6:32:46 AM (13 years ago)

Author:

Csaba Osztrogonác

Message:

[Qt] Implement find feature for QtTestBrowser
​https://bugs.webkit.org/show_bug.cgi?id=61425

Patch by Kristóf Kosztyó <​Kosztyo.Kristof@stud.u-szeged.hu> on 2011-05-31
Reviewed by Csaba Osztrogonác.

Buildfix for --minimal and CONFIG+=qt_minimal build.

• QtTestBrowser/launcherwindow.cpp:

(LauncherWindow::LauncherWindow):
(LauncherWindow::createChrome):

• QtTestBrowser/launcherwindow.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/launcherwindow.cpp (modified) (6 diffs)
• QtTestBrowser/launcherwindow.h (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-31  Kristóf Kosztyó  <Kosztyo.Kristof@stud.u-szeged.hu>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Implement find feature for QtTestBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=61425
+
+        Buildfix for --minimal and CONFIG+=qt_minimal build.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::LauncherWindow):
+        (LauncherWindow::createChrome):
+        * QtTestBrowser/launcherwindow.h:
+
 2011-05-31  Kristóf Kosztyó  <Kosztyo.Kristof@stud.u-szeged.hu>
 

trunk/Tools/QtTestBrowser/launcherwindow.cpp

@@ -47 +47 @@
     , m_formatMenuAction(0)
     , m_zoomAnimation(0)
+#ifndef QT_NO_LINEEDIT
     , m_findFlag(0)
+#endif
 {
     if (data)
@@ -199 +201 @@
     editMenu->addAction(page()->action(QWebPage::Paste));
     editMenu->addSeparator();
+#ifndef QT_NO_LINEEDIT
     editMenu->addAction("&Find", this, SLOT(showFindBar()), QKeySequence(Qt::CTRL | Qt::Key_F));
     editMenu->addSeparator();
+#endif
     QAction* setEditable = editMenu->addAction("Set Editable", this, SLOT(setEditable(bool)));
     setEditable->setCheckable(true);
@@ -411 +415 @@
     toggleJavascriptCanOpenWindows->setCheckable(true);
     toggleJavascriptCanOpenWindows->setChecked(false);
-
+#ifndef QT_NO_LINEEDIT
     m_findBar = new QToolBar("Find", this);
     addToolBar(Qt::BottomToolBarArea, m_findBar);
@@ -454 +458 @@
     m_findBar->setMovable(false);
     m_findBar->setVisible(false);
+#endif
 #endif
 }
@@ -1023 +1028 @@
 }
 
+#ifndef QT_NO_LINEEDIT
 void LauncherWindow::showFindBar()
 {
@@ -1058 +1064 @@
         page()->findText(m_lineEdit->text(), QFlag(m_findFlag));
 }
+#endif

trunk/Tools/QtTestBrowser/launcherwindow.h

@@ -191 +191 @@
     void toggleOfflineWebApplicationCache(bool toggle);
     void setOfflineStorageDefaultQuota();
-
+#ifndef QT_NO_LINEEDIT
     void showFindBar();
     void find(int mode);
+#endif
 #if defined(QT_CONFIGURED_WITH_OPENGL)
     void toggleQGLWidgetViewport(bool enable);
@@ -242 +243 @@
 
     QString m_inputUrl;
-
+#ifndef QT_NO_LINEEDIT
     QToolBar* m_findBar;
     QLineEdit* m_lineEdit;
     int m_findFlag;
     static const int s_findNormalFlag = 0;
+#endif
 };