Merge branch '4.6' of oslo-staging-1 into 4.6

3 files changed, 8 insertions, 5 deletions

diff --git a/examples/effects/blurpicker/blurpicker.h b/examples/effects/blurpicker/blurpicker.h
index b302db4..6972a39 100644
--- a/examples/effects/blurpicker/blurpicker.h
+++ b/examples/effects/blurpicker/blurpicker.h
@@ -51,7 +51,7 @@
 class BlurPicker: public QGraphicsView
 {
     Q_OBJECT
-    Q_PROPERTY(qreal index READ index WRITE setIndex);
+    Q_PROPERTY(qreal index READ index WRITE setIndex)
 
 public:
     BlurPicker(QWidget *parent = 0);
diff --git a/examples/webkit/fancybrowser/mainwindow.cpp b/examples/webkit/fancybrowser/mainwindow.cpp
index aa84871..844106f 100644
--- a/examples/webkit/fancybrowser/mainwindow.cpp
+++ b/examples/webkit/fancybrowser/mainwindow.cpp
@@ -82,7 +82,7 @@ MainWindow::MainWindow()
     QMenu *effectMenu = menuBar()->addMenu(tr("&Effect"));
     effectMenu->addAction("Highlight all links", this, SLOT(highlightAllLinks()));
 
-    QAction *rotateAction = new QAction(this);
+    rotateAction = new QAction(this);
     rotateAction->setIcon(style()->standardIcon(QStyle::SP_FileDialogDetailedView));
     rotateAction->setCheckable(true);
     rotateAction->setText(tr("Turn images upside down"));
@@ -136,6 +136,8 @@ void MainWindow::finishLoading(bool)
     progress = 100;
     adjustTitle();
     view->page()->mainFrame()->evaluateJavaScript(jQuery);
+
+    rotateImages(rotateAction->isChecked());
 }
 //! [6]
 
@@ -148,10 +150,10 @@ void MainWindow::highlightAllLinks()
 //! [7]
 
 //! [8]
-void MainWindow::rotateImages(bool toggle)
+void MainWindow::rotateImages(bool invert)
 {
     QString code;
-    if (toggle)
+    if (invert)
         code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s'); $(this).css('-webkit-transform', 'rotate(180deg)') } )";
     else
         code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s'); $(this).css('-webkit-transform', 'rotate(0deg)') } )";
diff --git a/examples/webkit/fancybrowser/mainwindow.h b/examples/webkit/fancybrowser/mainwindow.h
index 33fd8f5..214d84b 100644
--- a/examples/webkit/fancybrowser/mainwindow.h
+++ b/examples/webkit/fancybrowser/mainwindow.h
@@ -63,7 +63,7 @@ protected slots:
     void finishLoading(bool);
 
     void highlightAllLinks();
-    void rotateImages(bool toggle);
+    void rotateImages(bool invert);
     void removeGifImages();
     void removeInlineFrames();
     void removeObjectElements();
@@ -73,6 +73,7 @@ private:
     QString jQuery;
     QWebView *view;
     QLineEdit *locationEdit;
+    QAction *rotateAction;
     int progress;
 //! [1]
 };