I have made the following changes intended for : CE:MW:Shared / qmsystem Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/6702 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6702: Messages from BOSS: State: review at 2012-09-06T11:13:07 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: Project:MTF:MW / qmsystem -> CE:MW:Shared / qmsystem changes files: -------------- --- qmsystem.changes +++ qmsystem.changes @@ -0,0 +1,4 @@ +* Tue Sep 04 2012 Philippe De Swert <[email protected]> - 1.4.3.2 +- Fix bug where ask mode could not be set anymore as default mode +- Update usb test to the new usb functionality + new: ---- qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch spec files: ----------- --- qmsystem.spec +++ qmsystem.spec @@ -9,7 +9,7 @@ # << macros Summary: QmSystem library -Version: 1.4.3.1 +Version: 1.4.3.2 Release: 1 Group: System/System Control License: LGPLv2 @@ -22,6 +22,7 @@ Patch3: qmsystem-1.4.1-no-docs.patch Patch4: qmsystem-1.4.3-add-missing-lib-for-linking.patch Patch5: qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch +Patch6: qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch Requires: sensorfw >= 0.6.33 Requires: timed >= 2.31 Requires: mce @@ -74,6 +75,8 @@ %patch4 -p1 # qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch %patch5 -p1 +# qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch +%patch6 -p1 # >> setup # << setup other changes: -------------- ++++++ qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch (new) --- qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch +++ qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch @@ -0,0 +1,57 @@ +From 0acc926eb80584c2660b3b3d044ff628165d3629 Mon Sep 17 00:00:00 2001 +From: Philippe De Swert <[email protected]> +Date: Tue, 4 Sep 2012 14:16:31 +0300 +Subject: [PATCH] Fix up usb tests, fix bug that caused ask mode config option + not to be set + +Signed-off-by: Philippe De Swert <[email protected]> +--- + system/qmusbmode.cpp | 2 +- + tests/manual_usbmode/manual_usbmode.cpp | 4 ++++ + tests/usbmode/usbmode.cpp | 2 ++ + 3 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/system/qmusbmode.cpp b/system/qmusbmode.cpp +index a1cc03c..ff26b82 100644 +--- a/system/qmusbmode.cpp ++++ b/system/qmusbmode.cpp +@@ -164,7 +164,7 @@ bool QmUSBMode::setDefaultMode(QmUSBMode::Mode mode) { + MEEGO_PRIVATE(QmUSBMode); + + // The OviSuite, MassStorage, ChargingOnly and Ask modes can be requested +- if (!(OviSuite == mode || MassStorage == mode || ChargingOnly == mode || SDK == mode || Developer == mode || MTP == mode)) { ++ if (!(OviSuite == mode || MassStorage == mode || ChargingOnly == mode || SDK == mode || Developer == mode || MTP == mode || Ask == mode)) { + return false; + } + +diff --git a/tests/manual_usbmode/manual_usbmode.cpp b/tests/manual_usbmode/manual_usbmode.cpp +index 224ab31..d4c0bd6 100644 +--- a/tests/manual_usbmode/manual_usbmode.cpp ++++ b/tests/manual_usbmode/manual_usbmode.cpp +@@ -118,6 +118,10 @@ private: + return "SDK"; + case QmUSBMode::Undefined: + return "Undefined"; ++ case QmUSBMode::MTP: ++ return "MTP"; ++ case QmUSBMode::Developer: ++ return "Developer"; + default: + return "An unknown mode!"; + } +diff --git a/tests/usbmode/usbmode.cpp b/tests/usbmode/usbmode.cpp +index 7d70920..5ccbce1 100644 +--- a/tests/usbmode/usbmode.cpp ++++ b/tests/usbmode/usbmode.cpp +@@ -78,6 +78,8 @@ private slots: + setGetDefaultMode(QmUSBMode::ChargingOnly); + setGetDefaultMode(QmUSBMode::OviSuite); + setGetDefaultMode(QmUSBMode::Ask); ++ setGetDefaultMode(QmUSBMode::MTP); ++ setGetDefaultMode(QmUSBMode::Developer); + } + + void testMountStatus() { +-- +1.7.10.4 + ++++++ qmsystem.yaml --- qmsystem.yaml +++ qmsystem.yaml @@ -1,6 +1,6 @@ Name: qmsystem Summary: QmSystem library -Version: 1.4.3.1 +Version: 1.4.3.2 Release: 1 Group: System/System Control License: LGPLv2 @@ -14,6 +14,7 @@ - qmsystem-1.4.1-no-docs.patch - qmsystem-1.4.3-add-missing-lib-for-linking.patch - qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch + - qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch Description: This package contains the QmSystem library. Requires:
