From fd56ce60ffe2ebbaa508a0965e4e94651a8139c0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 26 Feb 2013 13:34:50 +0100 Subject: define MODULE_VERSION Task-number: QTBUG-29838 Change-Id: Ib5dd58a76e866781aef29976409a6c003d30c3dc Reviewed-by: Thiago Macieira --- .qmake.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.qmake.conf b/.qmake.conf index 5de255c..02554ab 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,2 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs + +MODULE_VERSION = 5.0.2 -- cgit v1.2.3 From 28e3409731241d727bca48be6b04cdacce463a10 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 19 Mar 2013 21:41:04 +0100 Subject: Add changes-5.0.2 file Change-Id: I7105fd60f24785744b2c0ad0970541cc501afeae Reviewed-by: Iikka Eklund --- dist/changes-5.0.2 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 dist/changes-5.0.2 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. -- cgit v1.2.3 From 22a18ef680833aacd89db571263a9bcf31c7f7db Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Feb 2013 10:42:09 +0100 Subject: disable the module when webkit is missing webkit may exclude itself from compilation. Change-Id: Icd15ddf1025bf8a29221c1d3f9a14ae190dbe5d8 Reviewed-by: Simon Hausmann --- qtwebkit-examples-and-demos.pro | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.3 From b207fe504c57768358c02fc03c53716aa91658fb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 22 Mar 2013 15:42:18 +0100 Subject: build with -no-widgets Change-Id: Ibd2ef43fbecc26b39fddecba4927acd6585acf79 Reviewed-by: Sergio Ahumada --- examples/examples.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From f275c054c3d833fe84bf8b87feca2137d7e984eb Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 14 Mar 2013 00:01:24 +1100 Subject: Namespace jQuery to avoid potentional conflicts The fancy browser example loads jQuery but web pages may already load their own jQuery which may conflict. Task-number: QTBUG-28959 Change-Id: I6868764012f36d72362010d3e0a77ba0320f24ba Reviewed-by: Jocelyn Turcotte --- examples/webkitwidgets/fancybrowser/mainwindow.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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] -- cgit v1.2.3 From 64956e77c8b71922df32b0925200940fcb969604 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Wed, 20 Mar 2013 19:12:06 +0100 Subject: The QT_NO_PRINTER guard is too generic if QPrintDialog is disabled Use QT_NO_PRINTDIALOG and QT_NO_PRINTPREVIEWDIALOG instead of QT_NO_PRINTER to guard QPrintDialog and QPrintPreviewDialog respectively to fix the build if printing is enabled but dialogs are not. Change-Id: I7c083c32b1ff0d2ea0793873533d184c067f01cd Reviewed-by: Michael Bruning Reviewed-by: Pierre Rossi --- examples/webkitwidgets/browser/browsermainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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")); -- cgit v1.2.3 From 57dd5916424afc646eb5101cf83e5a70b3cc3cfa Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Wed, 20 Mar 2013 19:19:48 +0100 Subject: Fix the build of the QML examples if C++11 is enabled The build fails with the following error message: unable to find string literal operator 'operator"" QWEBKIT_EXAMPLE_NAME' Add spaces around the define so that it is not interpreted as an operator expression. Change-Id: I0bdb10ab844441c280a1bd6ffaf75e0e2604f9da Reviewed-by: Michael Bruning Reviewed-by: Pierre Rossi --- examples/webkitqml/shared/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); -- cgit v1.2.3 From 08118e862731b5ce91368d326a04b4a565e7f483 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 25 Mar 2013 11:19:09 +0100 Subject: Bump MODULE_VERSION to 5.1.0 Change-Id: I61ad349fc3ebd49fba3bc3b5ddc12df2e42ac8c7 Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 02554ab..6aa780c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.0.2 +MODULE_VERSION = 5.1.0 -- cgit v1.2.3