From 65f32a22318cd60ecafbafd088dfd3e76713ef26 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 13 May 2013 12:25:09 +0200 Subject: Fix warnings about signal-slot connection in filetree example. Task-number: QTBUG-31079 Change-Id: I2696834f70bd0db05c9d70759b81159fabe561fd Reviewed-by: Jerome Pasion --- examples/xmlpatterns/filetree/mainwindow.cpp | 4 ++-- examples/xmlpatterns/filetree/mainwindow.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/xmlpatterns/filetree/mainwindow.cpp b/examples/xmlpatterns/filetree/mainwindow.cpp index cec7006..9bf71cd 100644 --- a/examples/xmlpatterns/filetree/mainwindow.cpp +++ b/examples/xmlpatterns/filetree/mainwindow.cpp @@ -81,9 +81,9 @@ MainWindow::MainWindow() : m_fileTree(m_namePool) //! [0] //! [2] -void MainWindow::on_queryBox_currentIndexChanged() +void MainWindow::on_queryBox_currentIndexChanged(const QString ¤tText) { - QFile queryFile(":/queries/" + queryBox->currentText()); + QFile queryFile(":/queries/" + currentText); queryFile.open(QIODevice::ReadOnly); queryEdit->setPlainText(QString::fromLatin1(queryFile.readAll())); diff --git a/examples/xmlpatterns/filetree/mainwindow.h b/examples/xmlpatterns/filetree/mainwindow.h index 5b39be5..aaaec9a 100644 --- a/examples/xmlpatterns/filetree/mainwindow.h +++ b/examples/xmlpatterns/filetree/mainwindow.h @@ -58,7 +58,7 @@ public: private slots: void on_actionOpenDirectory_triggered(); void on_actionAbout_triggered(); - void on_queryBox_currentIndexChanged(); + void on_queryBox_currentIndexChanged(const QString &); private: void loadDirectory(const QString &directory); -- cgit v1.2.1 From c7a791be7305a3872ddd26581dbb47f7a0c9d94c Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 13 May 2013 20:37:15 +0200 Subject: Add changes-5.1.0 file Change-Id: I0d3ebb797ee1c185162a6defa4a58e2ffbfca41b Reviewed-by: Oswald Buddenhagen --- dist/changes-5.1.0 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 dist/changes-5.1.0 diff --git a/dist/changes-5.1.0 b/dist/changes-5.1.0 new file mode 100644 index 0000000..505b0cc --- /dev/null +++ b/dist/changes-5.1.0 @@ -0,0 +1,22 @@ +Qt 5.1 introduces many new features and improvements as well as bugfixes +over the 5.0.x series. 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.1 + +The Qt version 5.1 series is binary compatible with the 5.0.x series. +Applications compiled for 5.0 will continue to run with 5.1. + +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 * +**************************************************************************** + + - This release contains only minor code improvements. -- cgit v1.2.1 From ee1ab14613744fb93b329b279a1949f52056d34e Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Fri, 24 May 2013 10:40:52 +0200 Subject: Doc: Removed module page from "technology-apis" group. The overviews in the main index.html replaced the technology-apis group. Change-Id: I827abd6488b07c75a23925137fce75d37de05319 Reviewed-by: Geir Vattekar --- src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc index db80710..6d9fb18 100644 --- a/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc +++ b/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc @@ -31,7 +31,6 @@ XQuery, XSLT and XML Schema validation. \ingroup modules - \ingroup technology-apis The \l{Qt XML Patterns} module provides support for XPath, XQuery, XSLT and XML Schema validation. -- cgit v1.2.1 From ce0f629b741f268d0546a775d9d8f4eec99d21d0 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 23 May 2013 19:35:14 +0200 Subject: sync.profile: Point dependencies to an empty string This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: Ia57b19490beaab0ab551620c5a033aaf0189a5b0 Reviewed-by: Frederik Gladhorn --- sync.profile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sync.profile b/sync.profile index 75a178b..675c687 100644 --- a/sync.profile +++ b/sync.profile @@ -8,7 +8,8 @@ # Each of the module version specifiers can take one of the following values: # - A specific Git revision. # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) +# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) # %dependencies = ( - "qtbase" => "refs/heads/stable", + "qtbase" => "", ); -- cgit v1.2.1 From b3aa3fe145888c58188cdd385c71469346e8e667 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 28 May 2013 20:32:01 +0200 Subject: Bump MODULE_VERSION to 5.1.1 Change-Id: I6a3c725d0c0a102a3f1254f203dde46e3512a9c5 Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 6aa780c..a7e09bf 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.1.0 +MODULE_VERSION = 5.1.1 -- cgit v1.2.1