From dac3266526afd188336ca50d2fcb6c3c96c5301c Mon Sep 17 00:00:00 2001 From: Espen Riskedal Date: Thu, 18 Jun 2009 13:44:26 +0200 Subject: make sure demo builds for S60 - we don't have QtUiTools yet --- demos/browser/browser.pro | 4 ++-- demos/browser/searchlineedit.cpp | 4 ++++ demos/browser/webview.cpp | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro index 7b7c448..72c6e88 100644 --- a/demos/browser/browser.pro +++ b/demos/browser/browser.pro @@ -3,7 +3,7 @@ TARGET = browser QT += webkit network CONFIG += qt warn_on -contains(QT_BUILD_PARTS, tools): CONFIG += uitools +contains(QT_BUILD_PARTS, tools):!symbian: CONFIG += uitools else: DEFINES += QT_NO_UITOOLS FORMS += \ @@ -92,4 +92,4 @@ INSTALLS += target sources include($$QT_SOURCE_TREE/demos/demobase.pri) -symbian:TARGET.UID3 = 0xA000CF70 \ No newline at end of file +symbian:TARGET.UID3 = 0xA000CF70 diff --git a/demos/browser/searchlineedit.cpp b/demos/browser/searchlineedit.cpp index 8f668e0..aa00475 100644 --- a/demos/browser/searchlineedit.cpp +++ b/demos/browser/searchlineedit.cpp @@ -50,7 +50,9 @@ ClearButton::ClearButton(QWidget *parent) : QAbstractButton(parent) { +#ifndef QT_NO_CURSOR setCursor(Qt::ArrowCursor); +#endif // QT_NO_CURSOR setToolTip(tr("Clear")); setVisible(false); setFocusPolicy(Qt::NoFocus); @@ -103,7 +105,9 @@ SearchButton::SearchButton(QWidget *parent) m_menu(0) { setObjectName(QLatin1String("SearchButton")); +#ifndef QT_NO_CURSOR setCursor(Qt::ArrowCursor); +#endif //QT_NO_CURSOR setFocusPolicy(Qt::NoFocus); } diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp index 6c4d857..63505f9 100644 --- a/demos/browser/webview.cpp +++ b/demos/browser/webview.cpp @@ -54,7 +54,9 @@ #include +#ifndef QT_NO_UITOOLS #include +#endif //QT_NO_UITOOLS #include #include -- cgit v0.12