Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id8cd85fdcb9d640238ebd07dc59023f4569f1ef8

7 files changed, 42 insertions, 11 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 5de255c..6aa780c 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,2 +1,4 @@
 load(qt_build_config)
 CONFIG += qt_example_installs
+
+MODULE_VERSION = 5.1.0
diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2
new file mode 100644
index 0000000..f29fa49
--- /dev/null
+++ b/dist/changes-5.0.2
@@ -0,0 +1,25 @@
+Qt 5.0.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0 and 5.0.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+ - This release contains only minor code improvements.
diff --git a/examples/examples.pro b/examples/examples.pro
index 2bcd42a..69cdb08 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS +=  webkitwidgets webkitqml
+SUBDIRS +=  webkitqml
+qtHaveModule(webkitwidgets): SUBDIRS += webkitwidgets
diff --git a/examples/webkitqml/shared/main.cpp b/examples/webkitqml/shared/main.cpp
index ac1de3e..ba2cbfa 100644
--- a/examples/webkitqml/shared/main.cpp
+++ b/examples/webkitqml/shared/main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc,argv);
     QQuickView view;
-    view.setSource(QUrl("qrc:///"QWEBKIT_EXAMPLE_NAME".qml"));
+    view.setSource(QUrl("qrc:///" QWEBKIT_EXAMPLE_NAME ".qml"));
     view.setResizeMode(QQuickView::SizeRootObjectToView);
     view.show();
     return app.exec();
diff --git a/examples/webkitwidgets/browser/browsermainwindow.cpp b/examples/webkitwidgets/browser/browsermainwindow.cpp
index ad9dc52..b94cb25 100644
--- a/examples/webkitwidgets/browser/browsermainwindow.cpp
+++ b/examples/webkitwidgets/browser/browsermainwindow.cpp
@@ -630,7 +630,7 @@ void BrowserMainWindow::slotFileOpen()
 
 void BrowserMainWindow::slotFilePrintPreview()
 {
-#ifndef QT_NO_PRINTER
+#ifndef QT_NO_PRINTPREVIEWDIALOG
     if (!currentTab())
         return;
     QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this);
@@ -649,7 +649,7 @@ void BrowserMainWindow::slotFilePrint()
 
 void BrowserMainWindow::printRequested(QWebFrame *frame)
 {
-#ifndef QT_NO_PRINTER
+#ifndef QT_NO_PRINTDIALOG
     QPrinter printer;
     QPrintDialog *dialog = new QPrintDialog(&printer, this);
     dialog->setWindowTitle(tr("Print Document"));
diff --git a/examples/webkitwidgets/fancybrowser/mainwindow.cpp b/examples/webkitwidgets/fancybrowser/mainwindow.cpp
index c53ce58..b00a433 100644
--- a/examples/webkitwidgets/fancybrowser/mainwindow.cpp
+++ b/examples/webkitwidgets/fancybrowser/mainwindow.cpp
@@ -53,6 +53,7 @@ MainWindow::MainWindow(const QUrl& url)
     file.setFileName(":/jquery.min.js");
     file.open(QIODevice::ReadOnly);
     jQuery = file.readAll();
+    jQuery.append("\nvar qt = { 'jQuery': jQuery.noConflict(true) };");
     file.close();
 //! [1]
 
@@ -170,7 +171,7 @@ void MainWindow::highlightAllLinks()
     // We append '; undefined' after the jQuery call here to prevent a possible recursion loop and crash caused by
     // the way the elements returned by the each iterator elements reference each other, which causes problems upon
     // converting them to QVariants.
-    QString code = "$('a').each( function () { $(this).css('background-color', 'yellow') } ); undefined";
+    QString code = "qt.jQuery('a').each( function () { qt.jQuery(this).css('background-color', 'yellow') } ); undefined";
     view->page()->mainFrame()->evaluateJavaScript(code);
 }
 //! [7]
@@ -184,9 +185,9 @@ void MainWindow::rotateImages(bool invert)
     // the way the elements returned by the each iterator elements reference each other, which causes problems upon
     // converting them to QVariants.
     if (invert)
-        code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s'); $(this).css('-webkit-transform', 'rotate(180deg)') } ); undefined";
+        code = "qt.jQuery('img').each( function () { qt.jQuery(this).css('-webkit-transition', '-webkit-transform 2s'); qt.jQuery(this).css('-webkit-transform', 'rotate(180deg)') } ); undefined";
     else
-        code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s'); $(this).css('-webkit-transform', 'rotate(0deg)') } ); undefined";
+        code = "qt.jQuery('img').each( function () { qt.jQuery(this).css('-webkit-transition', '-webkit-transform 2s'); qt.jQuery(this).css('-webkit-transform', 'rotate(0deg)') } ); undefined";
     view->page()->mainFrame()->evaluateJavaScript(code);
 }
 //! [8]
@@ -194,25 +195,25 @@ void MainWindow::rotateImages(bool invert)
 //! [9]
 void MainWindow::removeGifImages()
 {
-    QString code = "$('[src*=gif]').remove()";
+    QString code = "qt.jQuery('[src*=gif]').remove()";
     view->page()->mainFrame()->evaluateJavaScript(code);
 }
 
 void MainWindow::removeInlineFrames()
 {
-    QString code = "$('iframe').remove()";
+    QString code = "qt.jQuery('iframe').remove()";
     view->page()->mainFrame()->evaluateJavaScript(code);
 }
 
 void MainWindow::removeObjectElements()
 {
-    QString code = "$('object').remove()";
+    QString code = "qt.jQuery('object').remove()";
     view->page()->mainFrame()->evaluateJavaScript(code);
 }
 
 void MainWindow::removeEmbeddedElements()
 {
-    QString code = "$('embed').remove()";
+    QString code = "qt.jQuery('embed').remove()";
     view->page()->mainFrame()->evaluateJavaScript(code);
 }
 //! [9]
diff --git a/qtwebkit-examples-and-demos.pro b/qtwebkit-examples-and-demos.pro
index 3d23bb4..c6ad8c8 100644
--- a/qtwebkit-examples-and-demos.pro
+++ b/qtwebkit-examples-and-demos.pro
@@ -1,2 +1,4 @@
+requires(qtHaveModule(webkit))
+
 TEMPLATE = subdirs
 SUBDIRS +=  examples doc