diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:54:27 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:54:27 +0200 |
commit | e7c230923d097a68fe132d8bcdaf4766b488bbb3 (patch) | |
tree | 702fe88d6537b01e0258612733eb2482e21772d4 | |
parent | 3606f287cb1b86960b39e48e7b3c681a2c3465a8 (diff) | |
parent | b3aa3fe145888c58188cdd385c71469346e8e667 (diff) | |
download | qtxmlpatterns-e7c230923d097a68fe132d8bcdaf4766b488bbb3.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I6b08ce96935cf082c83496c521a9c1527f1321c4
-rw-r--r-- | dist/changes-5.1.0 | 22 | ||||
-rw-r--r-- | examples/xmlpatterns/filetree/mainwindow.cpp | 4 | ||||
-rw-r--r-- | examples/xmlpatterns/filetree/mainwindow.h | 2 | ||||
-rw-r--r-- | src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc | 1 | ||||
-rw-r--r-- | sync.profile | 3 |
5 files changed, 27 insertions, 5 deletions
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. 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); 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. diff --git a/sync.profile b/sync.profile index 068db2b..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/dev", + "qtbase" => "", ); |