diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-06-18 11:54:36 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-06-18 11:54:36 (GMT) |
| commit | 2bbe3adac53534156c9628533ef3ff292c69cadf (patch) | |
| tree | 84f9a6bc54329df36de49fa0150bc0cdea46edc8 | |
| parent | b2f4ac70bffc8d13177ad8aff632c6d1ebade0c5 (diff) | |
| parent | aba16af9e5f3d6d860aa403381940d26dae71df7 (diff) | |
| download | Qt-2bbe3adac53534156c9628533ef3ff292c69cadf.zip Qt-2bbe3adac53534156c9628533ef3ff292c69cadf.tar.gz Qt-2bbe3adac53534156c9628533ef3ff292c69cadf.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | demos/browser/browser.pro | 4 | ||||
| -rw-r--r-- | demos/browser/searchlineedit.cpp | 4 | ||||
| -rw-r--r-- | demos/browser/webview.cpp | 2 | ||||
| -rw-r--r-- | examples/webkit/fancybrowser/fancybrowser.pro | 4 | ||||
| -rw-r--r-- | examples/webkit/formextractor/formextractor.pro | 4 | ||||
| -rw-r--r-- | examples/webkit/googlechat/googlechat.pro | 4 | ||||
| -rw-r--r-- | examples/webkit/previewer/previewer.pro | 4 |
7 files changed, 16 insertions, 10 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 <QtWebKit/QWebHitTestResult> +#ifndef QT_NO_UITOOLS #include <QtUiTools/QUiLoader> +#endif //QT_NO_UITOOLS #include <QtCore/QDebug> #include <QtCore/QBuffer> diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro index afc0cc2..e496241 100644 --- a/examples/webkit/fancybrowser/fancybrowser.pro +++ b/examples/webkit/fancybrowser/fancybrowser.pro @@ -1,4 +1,4 @@ -QT += webkit +QT += webkit network HEADERS = mainwindow.h SOURCES = main.cpp \ mainwindow.cpp @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/fancybrowser INSTALLS += target sources -symbian:TARGET.UID3 = 0xA000CF6C
\ No newline at end of file +symbian:TARGET.UID3 = 0xA000CF6C diff --git a/examples/webkit/formextractor/formextractor.pro b/examples/webkit/formextractor/formextractor.pro index ecb264c..33e2267 100644 --- a/examples/webkit/formextractor/formextractor.pro +++ b/examples/webkit/formextractor/formextractor.pro @@ -1,4 +1,4 @@ -QT += webkit +QT += webkit network TARGET = formExtractor TEMPLATE = app SOURCES += main.cpp \ @@ -17,4 +17,4 @@ INSTALLS += target sources include($$QT_SOURCE_TREE/examples/examplebase.pri) -symbian:TARGET.UID3 = 0xA000CF6D
\ No newline at end of file +symbian:TARGET.UID3 = 0xA000CF6D diff --git a/examples/webkit/googlechat/googlechat.pro b/examples/webkit/googlechat/googlechat.pro index bc2aad3..8e4f9a6 100644 --- a/examples/webkit/googlechat/googlechat.pro +++ b/examples/webkit/googlechat/googlechat.pro @@ -1,4 +1,4 @@ -QT += webkit +QT += webkit network HEADERS = googlechat.h SOURCES = main.cpp \ googlechat.cpp @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlechat INSTALLS += target sources -symbian:TARGET.UID3 = 0xA000CF6E
\ No newline at end of file +symbian:TARGET.UID3 = 0xA000CF6E diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro index ce7906b..cc7fb73 100644 --- a/examples/webkit/previewer/previewer.pro +++ b/examples/webkit/previewer/previewer.pro @@ -1,4 +1,4 @@ -QT += webkit +QT += webkit network HEADERS = previewer.h \ mainwindow.h SOURCES = main.cpp \ @@ -14,4 +14,4 @@ INSTALLS += target sources include($$QT_SOURCE_TREE/examples/examplebase.pri) -symbian:TARGET.UID3 = 0xA000CF6F
\ No newline at end of file +symbian:TARGET.UID3 = 0xA000CF6F |