Modified: trunk/Tools/ChangeLog (87723 => 87724)
--- trunk/Tools/ChangeLog 2011-05-31 12:43:11 UTC (rev 87723)
+++ trunk/Tools/ChangeLog 2011-05-31 13:32:46 UTC (rev 87724)
@@ -5,9 +5,23 @@
[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ó <[email protected]>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Implement find feature for QtTestBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=61425
+
+ * QtTestBrowser/launcherwindow.cpp:
+ (LauncherWindow::LauncherWindow):
+ (LauncherWindow::createChrome):
(LauncherWindow::showFindBar):
(LauncherWindow::find):
* QtTestBrowser/launcherwindow.h:
Modified: trunk/Tools/QtTestBrowser/launcherwindow.cpp (87723 => 87724)
--- trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-05-31 12:43:11 UTC (rev 87723)
+++ trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-05-31 13:32:46 UTC (rev 87724)
@@ -46,7 +46,9 @@
, m_inspector(0)
, m_formatMenuAction(0)
, m_zoomAnimation(0)
+#ifndef QT_NO_LINEEDIT
, m_findFlag(0)
+#endif
{
if (data)
m_windowOptions = *data;
@@ -198,8 +200,10 @@
editMenu->addAction(page()->action(QWebPage::Copy));
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);
@@ -410,7 +414,7 @@
QAction* toggleJavascriptCanOpenWindows = settingsMenu->addAction("Enable js popup windows", this, SLOT(toggleJavascriptCanOpenWindows(bool)));
toggleJavascriptCanOpenWindows->setCheckable(true);
toggleJavascriptCanOpenWindows->setChecked(false);
-
+#ifndef QT_NO_LINEEDIT
m_findBar = new QToolBar("Find", this);
addToolBar(Qt::BottomToolBarArea, m_findBar);
@@ -454,6 +458,7 @@
m_findBar->setMovable(false);
m_findBar->setVisible(false);
#endif
+#endif
}
bool LauncherWindow::isGraphicsBased() const
@@ -1022,6 +1027,7 @@
return mw;
}
+#ifndef QT_NO_LINEEDIT
void LauncherWindow::showFindBar()
{
if (!m_findBar->isVisible()) {
@@ -1057,3 +1063,4 @@
if (m_findFlag & QWebPage::HighlightAllOccurrences)
page()->findText(m_lineEdit->text(), QFlag(m_findFlag));
}
+#endif
Modified: trunk/Tools/QtTestBrowser/launcherwindow.h (87723 => 87724)
--- trunk/Tools/QtTestBrowser/launcherwindow.h 2011-05-31 12:43:11 UTC (rev 87723)
+++ trunk/Tools/QtTestBrowser/launcherwindow.h 2011-05-31 13:32:46 UTC (rev 87724)
@@ -190,9 +190,10 @@
void toggleOfflineStorageDatabase(bool toggle);
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);
#endif
@@ -241,11 +242,12 @@
bool m_touchMocking;
QString m_inputUrl;
-
+#ifndef QT_NO_LINEEDIT
QToolBar* m_findBar;
QLineEdit* m_lineEdit;
int m_findFlag;
static const int s_findNormalFlag = 0;
+#endif
};
#endif
