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/101 Thank You, Dmitry Rozhkov [This message was auto-generated] --- Request # 101: Messages from BOSS: State: review at 2013-03-26T16:28:55 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,3 @@ +* Tue Mar 26 2013 Dmitry Rozhkov <[email protected]> - 0.0.2+really+0.0.0~git27697b38 +- Apply patch from Oleg Romashin 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch + new: ---- 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch spec files: ----------- --- qtest-qml.spec +++ qtest-qml.spec @@ -16,6 +16,7 @@ URL: http://qt.gitorious.org/qt-labs/qtest-qml Source0: qtest-qml-27697b38.tar.bz2 Source100: qtest-qml.yaml +Patch0: 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtCore) >= 4.7.1 @@ -38,6 +39,8 @@ %prep %setup -q -n %{name} +# 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch +%patch0 -p1 # >> setup # << setup other changes: -------------- ++++++ 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch (new) --- 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch +++ 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch @@ -0,0 +1,30 @@ +From 642aef2cea9b30d0645db1e401eb68aca56bafb5 Mon Sep 17 00:00:00 2001 +From: Dmitry Rozhkov <[email protected]> +Date: Tue, 26 Mar 2013 17:47:43 +0200 +Subject: [PATCH] Don't create event loop in quick_test_main() if it exists + already + +Main application using quicktestlib might need to tweak the +event loop to make it compatible with another event loop used in +component under test. +--- + 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 147f4fb..ef38b9f 100644 +--- a/src/quicktestlib/quicktest.cpp ++++ b/src/quicktestlib/quicktest.cpp +@@ -111,7 +111,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) + { +- 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. +-- +1.7.9.5 + ++++++ qtest-qml.yaml --- qtest-qml.yaml +++ qtest-qml.yaml @@ -12,6 +12,8 @@ URL: http://qt.gitorious.org/qt-labs/qtest-qml Sources: - qtest-qml-27697b38.tar.bz2 +Patches: + - 0001-Don-t-create-event-loop-in-quick_test_main-if-it-exi.patch Description: Qt Labs Unit test framework for QML Configure: none Builder: qmake
