I have made the following changes intended for : nemo:devel:mw / qtest-qml
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.merproject.org//request/show/167 Thank You, Dmitry Rozhkov [This message was auto-generated] --- Request # 167: Messages from BOSS: State: review at 2013-04-04T12:24:21 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:mw : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:rozhkov:branches:nemo:devel:mw / qtest-qml -> nemo:devel:mw / qtest-qml changes files: -------------- --- qtest-qml.changes +++ qtest-qml.changes @@ -0,0 +1,4 @@ +* Thu Apr 4 2013 Dmitry Rozhkov <[email protected]> - 0.0.2+really+0.0.1~git7703547 +- Update to latest upstream +- Apply patch from Oleg Romashin 0001-Don-t-destroy-qApp-if-it-s-created-outside-of-quick_.patch + old: ---- 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch qtest-qml-27697b38.tar.bz2 new: ---- 0001-Don-t-destroy-qApp-if-it-s-created-outside-of-quick_.patch qtest-qml-7703547.tar.bz2 spec files: ----------- --- qtest-qml.spec +++ qtest-qml.spec @@ -9,14 +9,14 @@ # << macros Summary: Unit test framework for QML -Version: 0.0.2+really+0.0.0~git27697b38 +Version: 0.0.2+really+0.0.1~git7703547 Release: 1 Group: System/Libraries License: LGPL v.2.1 URL: http://qt.gitorious.org/qt-labs/qtest-qml -Source0: qtest-qml-27697b38.tar.bz2 +Source0: qtest-qml-7703547.tar.bz2 Source100: qtest-qml.yaml -Patch0: 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch +Patch0: 0001-Don-t-destroy-qApp-if-it-s-created-outside-of-quick_.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtCore) >= 4.7.1 @@ -39,7 +39,7 @@ %prep %setup -q -n %{name} -# 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch +# 0001-Don-t-destroy-qApp-if-it-s-created-outside-of-quick_.patch %patch0 -p1 # >> setup # << setup other changes: -------------- ++++++ 0001-Don-t-destroy-qApp-if-it-s-created-outside-of-quick_.patch (new) --- 0001-Don-t-destroy-qApp-if-it-s-created-outside-of-quick_.patch +++ 0001-Don-t-destroy-qApp-if-it-s-created-outside-of-quick_.patch @@ -0,0 +1,27 @@ +From 9351019683bfbc9e0463fdf9f9ebe50869de5193 Mon Sep 17 00:00:00 2001 +From: Dmitry Rozhkov <[email protected]> +Date: Thu, 4 Apr 2013 11:25:19 +0300 +Subject: [PATCH] Don't destroy qApp if it's created outside of + quick_test_main() + +--- + src/quicktestlib/quicktest.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/quicktestlib/quicktest.cpp b/src/quicktestlib/quicktest.cpp +index ef38b9f..4ceebd8 100644 +--- a/src/quicktestlib/quicktest.cpp ++++ b/src/quicktestlib/quicktest.cpp +@@ -112,7 +112,8 @@ static inline QString stripQuotes(const QString &s) + int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport_create createViewport, const char *sourceDir) + { + // qApp might be already created in main application which is using quicktestlib +- QScopedPointer<QApplication> app(qApp ? qApp : new QApplication(argc, argv)); ++ // in case it is don't destroy it when leaving the scope. ++ QScopedPointer<QApplication> app(qApp ? NULL : new QApplication(argc, argv)); + + // Look for QML-specific command-line options. + // -import dir Specify an import directory. +-- +1.7.9.5 + ++++++ qtest-qml-27697b38.tar.bz2 -> qtest-qml-7703547.tar.bz2 --- src/quicktestlib/quicktest.cpp +++ src/quicktestlib/quicktest.cpp @@ -111,7 +111,8 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport_create createViewport, const char *sourceDir) { - QApplication app(argc, argv); + // qApp might be already created in main application which is using quicktestlib + QScopedPointer<QApplication> app(qApp ? qApp : new QApplication(argc, argv)); // Look for QML-specific command-line options. // -import dir Specify an import directory. ++++++ qtest-qml.yaml --- qtest-qml.yaml +++ qtest-qml.yaml @@ -5,15 +5,15 @@ # the version is just for Nemo packaging appended # with upstream git sha # -Version: 0.0.2+really+0.0.0~git27697b38 +Version: 0.0.2+really+0.0.1~git7703547 Release: 1 Group: System/Libraries License: LGPL v.2.1 URL: http://qt.gitorious.org/qt-labs/qtest-qml Sources: - - qtest-qml-27697b38.tar.bz2 + - qtest-qml-7703547.tar.bz2 Patches: - - 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch + - 0001-Don-t-destroy-qApp-if-it-s-created-outside-of-quick_.patch Description: Qt Labs Unit test framework for QML Configure: none Builder: qmake ++++++ deleted files: --- 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch
