summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-11-09 15:15:32 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-11-09 15:15:32 (GMT)
commit207970afe90e89dc47f3eb34f5dbf995fdebdce0 (patch)
tree5f9d5eb31b40fef17e523f51d65ac3fe7f2313fb /examples
parentf3ec877e6a606304ce766aebbb6886887ded37a2 (diff)
parent4454669fc238171239f8a2f202ec7e26e7409776 (diff)
downloadQt-207970afe90e89dc47f3eb34f5dbf995fdebdce0.zip
Qt-207970afe90e89dc47f3eb34f5dbf995fdebdce0.tar.gz
Qt-207970afe90e89dc47f3eb34f5dbf995fdebdce0.tar.bz2
Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6
Diffstat (limited to 'examples')
-rw-r--r--examples/webkit/fancybrowser/mainwindow.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/examples/webkit/fancybrowser/mainwindow.cpp b/examples/webkit/fancybrowser/mainwindow.cpp
index a3293b8..11fac91 100644
--- a/examples/webkit/fancybrowser/mainwindow.cpp
+++ b/examples/webkit/fancybrowser/mainwindow.cpp
@@ -150,12 +150,11 @@ void MainWindow::highlightAllLinks()
//! [8]
void MainWindow::rotateImages(bool toggle)
{
- QString code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s') } )";
- view->page()->mainFrame()->evaluateJavaScript(code);
+ QString code;
if (toggle)
- code = "$('img').each( function () { $(this).css('-webkit-transform', 'rotate(180deg)') } )";
+ 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-transform', 'rotate(0deg)') } )";
+ code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s'); $(this).css('-webkit-transform', 'rotate(0deg)') } )";
view->page()->mainFrame()->evaluateJavaScript(code);
}
//! [8]