1
=== modified file 'CameraApp/advancedcamerasettings.cpp'
2
--- CameraApp/advancedcamerasettings.cpp	2015-01-08 13:44:13 +0000
3
+++ CameraApp/advancedcamerasettings.cpp	2015-10-27 09:18:27 +0000
4
@@ -79,6 +79,7 @@
5
79
        return 0;
79
        return 0;
6
80
    }
80
    }
7
81
81
8
82
    return control;
9
82
}
83
}
10
83
84
11
84
QVideoDeviceSelectorControl* AdvancedCameraSettings::selectorFromCamera(QCamera *camera) const
85
QVideoDeviceSelectorControl* AdvancedCameraSettings::selectorFromCamera(QCamera *camera) const
Status:	Merged
Approved by:	Florian Boucault on 2015-10-28
Approved revision:	589
Merged at revision:	598
Proposed branch:	lp:~aacid/camera-app/missing-return
Merge into:	lp:camera-app
Diff against target:	11 lines (+1/-0) 1 file modified CameraApp/advancedcamerasettings.cpp (+1/-0)
To merge this branch:	bzr merge lp:~aacid/camera-app/missing-return
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-10-27
Ubuntu Phablet Team		2015-10-27	Pending
Review via email: mp+275819@code.launchpad.net
1	=== modified file 'CameraApp/advancedcamerasettings.cpp'
2	--- CameraApp/advancedcamerasettings.cpp 2015-01-08 13:44:13 +0000
3	+++ CameraApp/advancedcamerasettings.cpp 2015-10-27 09:18:27 +0000
4	@@ -79,6 +79,7 @@
5	79	return 0;	79	return 0;
6	80	}	80	}
7	81		81
8			82	return control;
9	82	}	83	}
10	83		84
11	84	QVideoDeviceSelectorControl* AdvancedCameraSettings::selectorFromCamera(QCamera *camera) const	85	QVideoDeviceSelectorControl* AdvancedCameraSettings::selectorFromCamera(QCamera *camera) const