Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Synchronizing to latest tree
  Adding correct hungarian translation
  Search local directory if no qconfig file found in src/corelib/global/
  Fix QT_NO_CLIPBOARD
  Fix QT_NO_ACTION

4 files changed, 10 insertions, 2 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 48826ffa85..94973f2833 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -1056,6 +1056,7 @@ void QDeclarativeTextEdit::select(int start, int end)
     updateSelectionMarkers();
 }
 
+#ifndef QT_NO_CLIPBOARD
 /*!
     \qmlmethod TextEdit::cut()
 
@@ -1088,7 +1089,7 @@ void QDeclarativeTextEdit::paste()
     Q_D(QDeclarativeTextEdit);
     d->control->paste();
 }
-
+#endif // QT_NO_CLIPBOARD
 
 /*!
 \overload
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
index 3846d4962b..0ecb2f3c3e 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
@@ -223,9 +223,11 @@ public Q_SLOTS:
     void selectAll();
     void selectWord();
     void select(int start, int end);
+#ifndef QT_NO_CLIPBOARD
     void cut();
     void copy();
     void paste();
+#endif
 
 private Q_SLOTS:
     void updateImgCache(const QRectF &rect);
diff --git a/src/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp
index 050e2b7130..9e5647f8bf 100644
--- a/src/imports/webkit/qdeclarativewebview.cpp
+++ b/src/imports/webkit/qdeclarativewebview.cpp
@@ -711,7 +711,7 @@ bool QDeclarativeWebView::sceneEvent(QEvent *event)
     return QDeclarativeItem::sceneEvent(event);
 }
 
-
+#ifndef QT_NO_ACTION
 /*!
     \qmlproperty action WebView::back
     This property holds the action for causing the previous URL in the history to be displayed.
@@ -747,6 +747,7 @@ QAction *QDeclarativeWebView::stopAction() const
 {
     return page()->action(QWebPage::Stop);
 }
+#endif // QT_NO_ACTION
 
 /*!
     \qmlproperty real WebView::title
diff --git a/src/imports/webkit/qdeclarativewebview_p.h b/src/imports/webkit/qdeclarativewebview_p.h
index 87bd938044..042237e5ff 100644
--- a/src/imports/webkit/qdeclarativewebview_p.h
+++ b/src/imports/webkit/qdeclarativewebview_p.h
@@ -108,10 +108,12 @@ class QDeclarativeWebView : public QDeclarativeItem
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 
+#ifndef QT_NO_ACTION
     Q_PROPERTY(QAction* reload READ reloadAction CONSTANT)
     Q_PROPERTY(QAction* back READ backAction CONSTANT)
     Q_PROPERTY(QAction* forward READ forwardAction CONSTANT)
     Q_PROPERTY(QAction* stop READ stopAction CONSTANT)
+#endif
 
     Q_PROPERTY(QDeclarativeWebSettings* settings READ settingsObject CONSTANT)
 
@@ -154,10 +156,12 @@ public:
     qreal progress() const;
     QString statusText() const;
 
+#ifndef QT_NO_ACTION
     QAction *reloadAction() const;
     QAction *backAction() const;
     QAction *forwardAction() const;
     QAction *stopAction() const;
+#endif
 
     QWebPage *page() const;
     void setPage(QWebPage *page);