diff options
author | aavit <eirik.aavitsland@digia.com> | 2013-10-08 16:55:15 +0200 |
---|---|---|
committer | Eirik Aavitsland <eirik.aavitsland@digia.com> | 2013-10-09 11:33:52 +0300 |
commit | bcc6a8fe80f2f31605afaae63e1b05051c0deb5f (patch) | |
tree | 408bb294cb2fb813f2b86fcf0ae90e0f9d1c3d88 | |
parent | ecd752748fd0385d6b22712663c0e1d1c87921af (diff) |
Moved Media Player and Camera from experimental to basicsuite
Change-Id: I8fd2335614062e1ca09f385ad6c0ae0dd19d694c
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@digia.com>
-rw-r--r-- | b2qt-demos.pro | 3 | ||||
-rw-r--r-- | basicsuite/Camera/Camera.pro (renamed from experimental/Camera/Camera.pro) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/CameraControlButton.qml (renamed from experimental/Camera/CameraControlButton.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/CameraSetting.qml (renamed from experimental/Camera/CameraSetting.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/CaptureControl.qml (renamed from experimental/Camera/CaptureControl.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/CapturePreview.qml (renamed from experimental/Camera/CapturePreview.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/Controls.qml (renamed from experimental/Camera/Controls.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/FocusControl.qml (renamed from experimental/Camera/FocusControl.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/Picker.qml (renamed from experimental/Camera/Picker.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/README (renamed from experimental/Camera/README) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/RecordingTime.qml (renamed from experimental/Camera/RecordingTime.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/Slider.qml (renamed from experimental/Camera/Slider.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/ZoomControl.qml (renamed from experimental/Camera/ZoomControl.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/camerautils/camerautils.cpp (renamed from experimental/Camera/camerautils/camerautils.cpp) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/camerautils/camerautils.h (renamed from experimental/Camera/camerautils/camerautils.h) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/camerautils/camerautils.pro (renamed from experimental/Camera/camerautils/camerautils.pro) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/camerautils/plugin.cpp (renamed from experimental/Camera/camerautils/plugin.cpp) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/camerautils/qmldir (renamed from experimental/Camera/camerautils/qmldir) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/description.txt (renamed from experimental/Camera/description.txt) | 0 | ||||
-rw-r--r-- | basicsuite/Camera/main.qml (renamed from experimental/Camera/main.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Content.qml (renamed from experimental/Media Player/Content.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/ContentVideo.qml (renamed from experimental/Media Player/ContentVideo.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/ControlBar.qml (renamed from experimental/Media Player/ControlBar.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/EffectSelectionPanel.qml (renamed from experimental/Media Player/EffectSelectionPanel.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/Effect.qml (renamed from experimental/Media Player/Effects/Effect.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectBillboard.qml (renamed from experimental/Media Player/Effects/EffectBillboard.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectBlackAndWhite.qml (renamed from experimental/Media Player/Effects/EffectBlackAndWhite.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectEmboss.qml (renamed from experimental/Media Player/Effects/EffectEmboss.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectGaussianBlur.qml (renamed from experimental/Media Player/Effects/EffectGaussianBlur.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectGlow.qml (renamed from experimental/Media Player/Effects/EffectGlow.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectIsolate.qml (renamed from experimental/Media Player/Effects/EffectIsolate.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectMagnify.qml (renamed from experimental/Media Player/Effects/EffectMagnify.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectPageCurl.qml (renamed from experimental/Media Player/Effects/EffectPageCurl.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectPassThrough.qml (renamed from experimental/Media Player/Effects/EffectPassThrough.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectPixelate.qml (renamed from experimental/Media Player/Effects/EffectPixelate.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectPosterize.qml (renamed from experimental/Media Player/Effects/EffectPosterize.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectRipple.qml (renamed from experimental/Media Player/Effects/EffectRipple.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectSepia.qml (renamed from experimental/Media Player/Effects/EffectSepia.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectSharpen.qml (renamed from experimental/Media Player/Effects/EffectSharpen.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectShockwave.qml (renamed from experimental/Media Player/Effects/EffectShockwave.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectSobelEdgeDetection1.qml (renamed from experimental/Media Player/Effects/EffectSobelEdgeDetection1.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectSobelEdgeDetection2.qml (renamed from experimental/Media Player/Effects/EffectSobelEdgeDetection2.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectTiltShift.qml (renamed from experimental/Media Player/Effects/EffectTiltShift.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectToon.qml (renamed from experimental/Media Player/Effects/EffectToon.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectVignette.qml (renamed from experimental/Media Player/Effects/EffectVignette.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectWarhol.qml (renamed from experimental/Media Player/Effects/EffectWarhol.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/Effects/EffectWobble.qml (renamed from experimental/Media Player/Effects/EffectWobble.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Media Player/FileBrowser.qml (renamed from experimental/Media Player/FileBrowser.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/ImageButton.qml (renamed from experimental/Media Player/ImageButton.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Media Player/Intro.qml (renamed from experimental/Media Player/Intro.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Media Player/MetadataView.qml (renamed from experimental/Media Player/MetadataView.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Media Player/ParameterPanel.qml (renamed from experimental/Media Player/ParameterPanel.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/PlaybackControl.qml (renamed from experimental/Media Player/PlaybackControl.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/SeekControl.qml (renamed from experimental/Media Player/SeekControl.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Media Player/Slider.qml (renamed from experimental/Media Player/Slider.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Media Player/UrlBar.qml (renamed from experimental/Media Player/UrlBar.qml) | 0 | ||||
-rwxr-xr-x | basicsuite/Media Player/VolumeControl.qml (renamed from experimental/Media Player/VolumeControl.qml) | 0 | ||||
-rw-r--r-- | basicsuite/Media Player/description.txt (renamed from experimental/Media Player/description.txt) | 0 | ||||
-rw-r--r-- | basicsuite/Media Player/images/CameraButton.png (renamed from experimental/Media Player/images/CameraButton.png) | bin | 237 -> 237 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/ControlBar.png (renamed from experimental/Media Player/images/ControlBar.png) | bin | 5081 -> 5081 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/FXButton.png (renamed from experimental/Media Player/images/FXButton.png) | bin | 1208 -> 1208 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/FileButton.png (renamed from experimental/Media Player/images/FileButton.png) | bin | 564 -> 564 bytes | |||
-rwxr-xr-x | basicsuite/Media Player/images/FullscreenButton.png (renamed from experimental/Media Player/images/FullscreenButton.png) | bin | 4304 -> 4304 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/PauseButton.png (renamed from experimental/Media Player/images/PauseButton.png) | bin | 762 -> 762 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/PlayButton.png (renamed from experimental/Media Player/images/PlayButton.png) | bin | 1679 -> 1679 bytes | |||
-rwxr-xr-x | basicsuite/Media Player/images/PlaybackSlider.png (renamed from experimental/Media Player/images/PlaybackSlider.png) | bin | 435 -> 435 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/RateButtonForward.png (renamed from experimental/Media Player/images/RateButtonForward.png) | bin | 1387 -> 1387 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/RateButtonReverse.png (renamed from experimental/Media Player/images/RateButtonReverse.png) | bin | 1433 -> 1433 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/SliderBackground.png (renamed from experimental/Media Player/images/SliderBackground.png) | bin | 793 -> 793 bytes | |||
-rwxr-xr-x | basicsuite/Media Player/images/SliderHandle.png (renamed from experimental/Media Player/images/SliderHandle.png) | bin | 4459 -> 4459 bytes | |||
-rwxr-xr-x | basicsuite/Media Player/images/SliderProgress.png (renamed from experimental/Media Player/images/SliderProgress.png) | bin | 4461 -> 4461 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/UrlButton.png (renamed from experimental/Media Player/images/UrlButton.png) | bin | 1613 -> 1613 bytes | |||
-rwxr-xr-x | basicsuite/Media Player/images/VolumeDown.png (renamed from experimental/Media Player/images/VolumeDown.png) | bin | 4130 -> 4130 bytes | |||
-rwxr-xr-x | basicsuite/Media Player/images/VolumeUp.png (renamed from experimental/Media Player/images/VolumeUp.png) | bin | 4258 -> 4258 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/folder.png (renamed from experimental/Media Player/images/folder.png) | bin | 1841 -> 1841 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/gradient.png (renamed from experimental/Media Player/images/gradient.png) | bin | 34302 -> 34302 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/pattern.png (renamed from experimental/Media Player/images/pattern.png) | bin | 2627 -> 2627 bytes | |||
-rwxr-xr-x | basicsuite/Media Player/images/qt-logo.png (renamed from experimental/Media Player/images/qt-logo.png) | bin | 11465 -> 11465 bytes | |||
-rw-r--r-- | basicsuite/Media Player/images/titlebar.png (renamed from experimental/Media Player/images/titlebar.png) | bin | 1436 -> 1436 bytes | |||
-rwxr-xr-x | basicsuite/Media Player/images/titlebar.sci (renamed from experimental/Media Player/images/titlebar.sci) | 0 | ||||
-rw-r--r-- | basicsuite/Media Player/images/up.png (renamed from experimental/Media Player/images/up.png) | bin | 662 -> 662 bytes | |||
-rwxr-xr-x | basicsuite/Media Player/main.qml (renamed from experimental/Media Player/main.qml) | 0 | ||||
-rw-r--r-- | basicsuite/basicsuite.pro | 1 | ||||
-rw-r--r-- | experimental/experimental.pro | 3 |
84 files changed, 2 insertions, 5 deletions
diff --git a/b2qt-demos.pro b/b2qt-demos.pro index 93b6e9f..d5943bc 100644 --- a/b2qt-demos.pro +++ b/b2qt-demos.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs SUBDIRS += \ - basicsuite \ - experimental + basicsuite diff --git a/experimental/Camera/Camera.pro b/basicsuite/Camera/Camera.pro index d8e46c6..d8e46c6 100644 --- a/experimental/Camera/Camera.pro +++ b/basicsuite/Camera/Camera.pro diff --git a/experimental/Camera/CameraControlButton.qml b/basicsuite/Camera/CameraControlButton.qml index dc82435..dc82435 100644 --- a/experimental/Camera/CameraControlButton.qml +++ b/basicsuite/Camera/CameraControlButton.qml diff --git a/experimental/Camera/CameraSetting.qml b/basicsuite/Camera/CameraSetting.qml index 224c70c..224c70c 100644 --- a/experimental/Camera/CameraSetting.qml +++ b/basicsuite/Camera/CameraSetting.qml diff --git a/experimental/Camera/CaptureControl.qml b/basicsuite/Camera/CaptureControl.qml index b8180f9..b8180f9 100644 --- a/experimental/Camera/CaptureControl.qml +++ b/basicsuite/Camera/CaptureControl.qml diff --git a/experimental/Camera/CapturePreview.qml b/basicsuite/Camera/CapturePreview.qml index 611fa53..611fa53 100644 --- a/experimental/Camera/CapturePreview.qml +++ b/basicsuite/Camera/CapturePreview.qml diff --git a/experimental/Camera/Controls.qml b/basicsuite/Camera/Controls.qml index 63f750b..63f750b 100644 --- a/experimental/Camera/Controls.qml +++ b/basicsuite/Camera/Controls.qml diff --git a/experimental/Camera/FocusControl.qml b/basicsuite/Camera/FocusControl.qml index f9b2f29..f9b2f29 100644 --- a/experimental/Camera/FocusControl.qml +++ b/basicsuite/Camera/FocusControl.qml diff --git a/experimental/Camera/Picker.qml b/basicsuite/Camera/Picker.qml index 364fed7..364fed7 100644 --- a/experimental/Camera/Picker.qml +++ b/basicsuite/Camera/Picker.qml diff --git a/experimental/Camera/README b/basicsuite/Camera/README index e249fae..e249fae 100644 --- a/experimental/Camera/README +++ b/basicsuite/Camera/README diff --git a/experimental/Camera/RecordingTime.qml b/basicsuite/Camera/RecordingTime.qml index 504d232..504d232 100644 --- a/experimental/Camera/RecordingTime.qml +++ b/basicsuite/Camera/RecordingTime.qml diff --git a/experimental/Camera/Slider.qml b/basicsuite/Camera/Slider.qml index 025d521..025d521 100644 --- a/experimental/Camera/Slider.qml +++ b/basicsuite/Camera/Slider.qml diff --git a/experimental/Camera/ZoomControl.qml b/basicsuite/Camera/ZoomControl.qml index 493defe..493defe 100644 --- a/experimental/Camera/ZoomControl.qml +++ b/basicsuite/Camera/ZoomControl.qml diff --git a/experimental/Camera/camerautils/camerautils.cpp b/basicsuite/Camera/camerautils/camerautils.cpp index 608bfaa..608bfaa 100644 --- a/experimental/Camera/camerautils/camerautils.cpp +++ b/basicsuite/Camera/camerautils/camerautils.cpp diff --git a/experimental/Camera/camerautils/camerautils.h b/basicsuite/Camera/camerautils/camerautils.h index 562b675..562b675 100644 --- a/experimental/Camera/camerautils/camerautils.h +++ b/basicsuite/Camera/camerautils/camerautils.h diff --git a/experimental/Camera/camerautils/camerautils.pro b/basicsuite/Camera/camerautils/camerautils.pro index 938a0a9..938a0a9 100644 --- a/experimental/Camera/camerautils/camerautils.pro +++ b/basicsuite/Camera/camerautils/camerautils.pro diff --git a/experimental/Camera/camerautils/plugin.cpp b/basicsuite/Camera/camerautils/plugin.cpp index 2a8c3ea..2a8c3ea 100644 --- a/experimental/Camera/camerautils/plugin.cpp +++ b/basicsuite/Camera/camerautils/plugin.cpp diff --git a/experimental/Camera/camerautils/qmldir b/basicsuite/Camera/camerautils/qmldir index a5ab412..a5ab412 100644 --- a/experimental/Camera/camerautils/qmldir +++ b/basicsuite/Camera/camerautils/qmldir diff --git a/experimental/Camera/description.txt b/basicsuite/Camera/description.txt index 7e94e89..7e94e89 100644 --- a/experimental/Camera/description.txt +++ b/basicsuite/Camera/description.txt diff --git a/experimental/Camera/main.qml b/basicsuite/Camera/main.qml index a1cc89c..a1cc89c 100644 --- a/experimental/Camera/main.qml +++ b/basicsuite/Camera/main.qml diff --git a/experimental/Media Player/Content.qml b/basicsuite/Media Player/Content.qml index d519fcb..d519fcb 100755 --- a/experimental/Media Player/Content.qml +++ b/basicsuite/Media Player/Content.qml diff --git a/experimental/Media Player/ContentVideo.qml b/basicsuite/Media Player/ContentVideo.qml index fb5c86d..fb5c86d 100755 --- a/experimental/Media Player/ContentVideo.qml +++ b/basicsuite/Media Player/ContentVideo.qml diff --git a/experimental/Media Player/ControlBar.qml b/basicsuite/Media Player/ControlBar.qml index 1778728..1778728 100755 --- a/experimental/Media Player/ControlBar.qml +++ b/basicsuite/Media Player/ControlBar.qml diff --git a/experimental/Media Player/EffectSelectionPanel.qml b/basicsuite/Media Player/EffectSelectionPanel.qml index 4f7e161..4f7e161 100755 --- a/experimental/Media Player/EffectSelectionPanel.qml +++ b/basicsuite/Media Player/EffectSelectionPanel.qml diff --git a/experimental/Media Player/Effects/Effect.qml b/basicsuite/Media Player/Effects/Effect.qml index 99308fd..99308fd 100755 --- a/experimental/Media Player/Effects/Effect.qml +++ b/basicsuite/Media Player/Effects/Effect.qml diff --git a/experimental/Media Player/Effects/EffectBillboard.qml b/basicsuite/Media Player/Effects/EffectBillboard.qml index 947209e..947209e 100755 --- a/experimental/Media Player/Effects/EffectBillboard.qml +++ b/basicsuite/Media Player/Effects/EffectBillboard.qml diff --git a/experimental/Media Player/Effects/EffectBlackAndWhite.qml b/basicsuite/Media Player/Effects/EffectBlackAndWhite.qml index 8cbba60..8cbba60 100755 --- a/experimental/Media Player/Effects/EffectBlackAndWhite.qml +++ b/basicsuite/Media Player/Effects/EffectBlackAndWhite.qml diff --git a/experimental/Media Player/Effects/EffectEmboss.qml b/basicsuite/Media Player/Effects/EffectEmboss.qml index 23ef1cb..23ef1cb 100755 --- a/experimental/Media Player/Effects/EffectEmboss.qml +++ b/basicsuite/Media Player/Effects/EffectEmboss.qml diff --git a/experimental/Media Player/Effects/EffectGaussianBlur.qml b/basicsuite/Media Player/Effects/EffectGaussianBlur.qml index f866524..f866524 100755 --- a/experimental/Media Player/Effects/EffectGaussianBlur.qml +++ b/basicsuite/Media Player/Effects/EffectGaussianBlur.qml diff --git a/experimental/Media Player/Effects/EffectGlow.qml b/basicsuite/Media Player/Effects/EffectGlow.qml index 2cfee3b..2cfee3b 100755 --- a/experimental/Media Player/Effects/EffectGlow.qml +++ b/basicsuite/Media Player/Effects/EffectGlow.qml diff --git a/experimental/Media Player/Effects/EffectIsolate.qml b/basicsuite/Media Player/Effects/EffectIsolate.qml index 4c569a5..4c569a5 100755 --- a/experimental/Media Player/Effects/EffectIsolate.qml +++ b/basicsuite/Media Player/Effects/EffectIsolate.qml diff --git a/experimental/Media Player/Effects/EffectMagnify.qml b/basicsuite/Media Player/Effects/EffectMagnify.qml index 01f33a5..01f33a5 100755 --- a/experimental/Media Player/Effects/EffectMagnify.qml +++ b/basicsuite/Media Player/Effects/EffectMagnify.qml diff --git a/experimental/Media Player/Effects/EffectPageCurl.qml b/basicsuite/Media Player/Effects/EffectPageCurl.qml index 39947d9..39947d9 100755 --- a/experimental/Media Player/Effects/EffectPageCurl.qml +++ b/basicsuite/Media Player/Effects/EffectPageCurl.qml diff --git a/experimental/Media Player/Effects/EffectPassThrough.qml b/basicsuite/Media Player/Effects/EffectPassThrough.qml index 1f259be..1f259be 100755 --- a/experimental/Media Player/Effects/EffectPassThrough.qml +++ b/basicsuite/Media Player/Effects/EffectPassThrough.qml diff --git a/experimental/Media Player/Effects/EffectPixelate.qml b/basicsuite/Media Player/Effects/EffectPixelate.qml index 4bc73d3..4bc73d3 100755 --- a/experimental/Media Player/Effects/EffectPixelate.qml +++ b/basicsuite/Media Player/Effects/EffectPixelate.qml diff --git a/experimental/Media Player/Effects/EffectPosterize.qml b/basicsuite/Media Player/Effects/EffectPosterize.qml index 4b661a5..4b661a5 100755 --- a/experimental/Media Player/Effects/EffectPosterize.qml +++ b/basicsuite/Media Player/Effects/EffectPosterize.qml diff --git a/experimental/Media Player/Effects/EffectRipple.qml b/basicsuite/Media Player/Effects/EffectRipple.qml index 7a82f50..7a82f50 100755 --- a/experimental/Media Player/Effects/EffectRipple.qml +++ b/basicsuite/Media Player/Effects/EffectRipple.qml diff --git a/experimental/Media Player/Effects/EffectSepia.qml b/basicsuite/Media Player/Effects/EffectSepia.qml index 2539680..2539680 100755 --- a/experimental/Media Player/Effects/EffectSepia.qml +++ b/basicsuite/Media Player/Effects/EffectSepia.qml diff --git a/experimental/Media Player/Effects/EffectSharpen.qml b/basicsuite/Media Player/Effects/EffectSharpen.qml index c30f298..c30f298 100755 --- a/experimental/Media Player/Effects/EffectSharpen.qml +++ b/basicsuite/Media Player/Effects/EffectSharpen.qml diff --git a/experimental/Media Player/Effects/EffectShockwave.qml b/basicsuite/Media Player/Effects/EffectShockwave.qml index 1078b73..1078b73 100755 --- a/experimental/Media Player/Effects/EffectShockwave.qml +++ b/basicsuite/Media Player/Effects/EffectShockwave.qml diff --git a/experimental/Media Player/Effects/EffectSobelEdgeDetection1.qml b/basicsuite/Media Player/Effects/EffectSobelEdgeDetection1.qml index 56f4869..56f4869 100755 --- a/experimental/Media Player/Effects/EffectSobelEdgeDetection1.qml +++ b/basicsuite/Media Player/Effects/EffectSobelEdgeDetection1.qml diff --git a/experimental/Media Player/Effects/EffectSobelEdgeDetection2.qml b/basicsuite/Media Player/Effects/EffectSobelEdgeDetection2.qml index 938912d..938912d 100755 --- a/experimental/Media Player/Effects/EffectSobelEdgeDetection2.qml +++ b/basicsuite/Media Player/Effects/EffectSobelEdgeDetection2.qml diff --git a/experimental/Media Player/Effects/EffectTiltShift.qml b/basicsuite/Media Player/Effects/EffectTiltShift.qml index d0cf9c4..d0cf9c4 100755 --- a/experimental/Media Player/Effects/EffectTiltShift.qml +++ b/basicsuite/Media Player/Effects/EffectTiltShift.qml diff --git a/experimental/Media Player/Effects/EffectToon.qml b/basicsuite/Media Player/Effects/EffectToon.qml index a17ad1c..a17ad1c 100755 --- a/experimental/Media Player/Effects/EffectToon.qml +++ b/basicsuite/Media Player/Effects/EffectToon.qml diff --git a/experimental/Media Player/Effects/EffectVignette.qml b/basicsuite/Media Player/Effects/EffectVignette.qml index 5ec5090..5ec5090 100755 --- a/experimental/Media Player/Effects/EffectVignette.qml +++ b/basicsuite/Media Player/Effects/EffectVignette.qml diff --git a/experimental/Media Player/Effects/EffectWarhol.qml b/basicsuite/Media Player/Effects/EffectWarhol.qml index 1e40b30..1e40b30 100755 --- a/experimental/Media Player/Effects/EffectWarhol.qml +++ b/basicsuite/Media Player/Effects/EffectWarhol.qml diff --git a/experimental/Media Player/Effects/EffectWobble.qml b/basicsuite/Media Player/Effects/EffectWobble.qml index 4b07639..4b07639 100755 --- a/experimental/Media Player/Effects/EffectWobble.qml +++ b/basicsuite/Media Player/Effects/EffectWobble.qml diff --git a/experimental/Media Player/FileBrowser.qml b/basicsuite/Media Player/FileBrowser.qml index 33d14cf..33d14cf 100644 --- a/experimental/Media Player/FileBrowser.qml +++ b/basicsuite/Media Player/FileBrowser.qml diff --git a/experimental/Media Player/ImageButton.qml b/basicsuite/Media Player/ImageButton.qml index 274efd5..274efd5 100755 --- a/experimental/Media Player/ImageButton.qml +++ b/basicsuite/Media Player/ImageButton.qml diff --git a/experimental/Media Player/Intro.qml b/basicsuite/Media Player/Intro.qml index a5dbb2a..a5dbb2a 100644 --- a/experimental/Media Player/Intro.qml +++ b/basicsuite/Media Player/Intro.qml diff --git a/experimental/Media Player/MetadataView.qml b/basicsuite/Media Player/MetadataView.qml index b0b907b..b0b907b 100644 --- a/experimental/Media Player/MetadataView.qml +++ b/basicsuite/Media Player/MetadataView.qml diff --git a/experimental/Media Player/ParameterPanel.qml b/basicsuite/Media Player/ParameterPanel.qml index 51b9938..51b9938 100644 --- a/experimental/Media Player/ParameterPanel.qml +++ b/basicsuite/Media Player/ParameterPanel.qml diff --git a/experimental/Media Player/PlaybackControl.qml b/basicsuite/Media Player/PlaybackControl.qml index 2dc609f..2dc609f 100755 --- a/experimental/Media Player/PlaybackControl.qml +++ b/basicsuite/Media Player/PlaybackControl.qml diff --git a/experimental/Media Player/SeekControl.qml b/basicsuite/Media Player/SeekControl.qml index fa0842d..fa0842d 100755 --- a/experimental/Media Player/SeekControl.qml +++ b/basicsuite/Media Player/SeekControl.qml diff --git a/experimental/Media Player/Slider.qml b/basicsuite/Media Player/Slider.qml index 17fd8cd..17fd8cd 100644 --- a/experimental/Media Player/Slider.qml +++ b/basicsuite/Media Player/Slider.qml diff --git a/experimental/Media Player/UrlBar.qml b/basicsuite/Media Player/UrlBar.qml index cfada41..cfada41 100644 --- a/experimental/Media Player/UrlBar.qml +++ b/basicsuite/Media Player/UrlBar.qml diff --git a/experimental/Media Player/VolumeControl.qml b/basicsuite/Media Player/VolumeControl.qml index e814b99..e814b99 100755 --- a/experimental/Media Player/VolumeControl.qml +++ b/basicsuite/Media Player/VolumeControl.qml diff --git a/experimental/Media Player/description.txt b/basicsuite/Media Player/description.txt index bf034e5..bf034e5 100644 --- a/experimental/Media Player/description.txt +++ b/basicsuite/Media Player/description.txt diff --git a/experimental/Media Player/images/CameraButton.png b/basicsuite/Media Player/images/CameraButton.png Binary files differindex d950f78..d950f78 100644 --- a/experimental/Media Player/images/CameraButton.png +++ b/basicsuite/Media Player/images/CameraButton.png diff --git a/experimental/Media Player/images/ControlBar.png b/basicsuite/Media Player/images/ControlBar.png Binary files differindex 8b5f545..8b5f545 100644 --- a/experimental/Media Player/images/ControlBar.png +++ b/basicsuite/Media Player/images/ControlBar.png diff --git a/experimental/Media Player/images/FXButton.png b/basicsuite/Media Player/images/FXButton.png Binary files differindex 04530f4..04530f4 100644 --- a/experimental/Media Player/images/FXButton.png +++ b/basicsuite/Media Player/images/FXButton.png diff --git a/experimental/Media Player/images/FileButton.png b/basicsuite/Media Player/images/FileButton.png Binary files differindex d65e681..d65e681 100644 --- a/experimental/Media Player/images/FileButton.png +++ b/basicsuite/Media Player/images/FileButton.png diff --git a/experimental/Media Player/images/FullscreenButton.png b/basicsuite/Media Player/images/FullscreenButton.png Binary files differindex 413872a..413872a 100755 --- a/experimental/Media Player/images/FullscreenButton.png +++ b/basicsuite/Media Player/images/FullscreenButton.png diff --git a/experimental/Media Player/images/PauseButton.png b/basicsuite/Media Player/images/PauseButton.png Binary files differindex 0d3e2d1..0d3e2d1 100644 --- a/experimental/Media Player/images/PauseButton.png +++ b/basicsuite/Media Player/images/PauseButton.png diff --git a/experimental/Media Player/images/PlayButton.png b/basicsuite/Media Player/images/PlayButton.png Binary files differindex 9a85633..9a85633 100644 --- a/experimental/Media Player/images/PlayButton.png +++ b/basicsuite/Media Player/images/PlayButton.png diff --git a/experimental/Media Player/images/PlaybackSlider.png b/basicsuite/Media Player/images/PlaybackSlider.png Binary files differindex 3716315..3716315 100755 --- a/experimental/Media Player/images/PlaybackSlider.png +++ b/basicsuite/Media Player/images/PlaybackSlider.png diff --git a/experimental/Media Player/images/RateButtonForward.png b/basicsuite/Media Player/images/RateButtonForward.png Binary files differindex 4b52603..4b52603 100644 --- a/experimental/Media Player/images/RateButtonForward.png +++ b/basicsuite/Media Player/images/RateButtonForward.png diff --git a/experimental/Media Player/images/RateButtonReverse.png b/basicsuite/Media Player/images/RateButtonReverse.png Binary files differindex 64e94ed..64e94ed 100644 --- a/experimental/Media Player/images/RateButtonReverse.png +++ b/basicsuite/Media Player/images/RateButtonReverse.png diff --git a/experimental/Media Player/images/SliderBackground.png b/basicsuite/Media Player/images/SliderBackground.png Binary files differindex b83f729..b83f729 100644 --- a/experimental/Media Player/images/SliderBackground.png +++ b/basicsuite/Media Player/images/SliderBackground.png diff --git a/experimental/Media Player/images/SliderHandle.png b/basicsuite/Media Player/images/SliderHandle.png Binary files differindex 5206100..5206100 100755 --- a/experimental/Media Player/images/SliderHandle.png +++ b/basicsuite/Media Player/images/SliderHandle.png diff --git a/experimental/Media Player/images/SliderProgress.png b/basicsuite/Media Player/images/SliderProgress.png Binary files differindex e0efc87..e0efc87 100755 --- a/experimental/Media Player/images/SliderProgress.png +++ b/basicsuite/Media Player/images/SliderProgress.png diff --git a/experimental/Media Player/images/UrlButton.png b/basicsuite/Media Player/images/UrlButton.png Binary files differindex 876951f..876951f 100644 --- a/experimental/Media Player/images/UrlButton.png +++ b/basicsuite/Media Player/images/UrlButton.png diff --git a/experimental/Media Player/images/VolumeDown.png b/basicsuite/Media Player/images/VolumeDown.png Binary files differindex 60c626d..60c626d 100755 --- a/experimental/Media Player/images/VolumeDown.png +++ b/basicsuite/Media Player/images/VolumeDown.png diff --git a/experimental/Media Player/images/VolumeUp.png b/basicsuite/Media Player/images/VolumeUp.png Binary files differindex 886fde7..886fde7 100755 --- a/experimental/Media Player/images/VolumeUp.png +++ b/basicsuite/Media Player/images/VolumeUp.png diff --git a/experimental/Media Player/images/folder.png b/basicsuite/Media Player/images/folder.png Binary files differindex e53e2ad..e53e2ad 100644 --- a/experimental/Media Player/images/folder.png +++ b/basicsuite/Media Player/images/folder.png diff --git a/experimental/Media Player/images/gradient.png b/basicsuite/Media Player/images/gradient.png Binary files differindex 1cd7281..1cd7281 100644 --- a/experimental/Media Player/images/gradient.png +++ b/basicsuite/Media Player/images/gradient.png diff --git a/experimental/Media Player/images/pattern.png b/basicsuite/Media Player/images/pattern.png Binary files differindex 028181e..028181e 100644 --- a/experimental/Media Player/images/pattern.png +++ b/basicsuite/Media Player/images/pattern.png diff --git a/experimental/Media Player/images/qt-logo.png b/basicsuite/Media Player/images/qt-logo.png Binary files differindex 242bb28..242bb28 100755 --- a/experimental/Media Player/images/qt-logo.png +++ b/basicsuite/Media Player/images/qt-logo.png diff --git a/experimental/Media Player/images/titlebar.png b/basicsuite/Media Player/images/titlebar.png Binary files differindex 51c9008..51c9008 100644 --- a/experimental/Media Player/images/titlebar.png +++ b/basicsuite/Media Player/images/titlebar.png diff --git a/experimental/Media Player/images/titlebar.sci b/basicsuite/Media Player/images/titlebar.sci index 0418d94..0418d94 100755 --- a/experimental/Media Player/images/titlebar.sci +++ b/basicsuite/Media Player/images/titlebar.sci diff --git a/experimental/Media Player/images/up.png b/basicsuite/Media Player/images/up.png Binary files differindex b05f802..b05f802 100644 --- a/experimental/Media Player/images/up.png +++ b/basicsuite/Media Player/images/up.png diff --git a/experimental/Media Player/main.qml b/basicsuite/Media Player/main.qml index d8075c8..d8075c8 100755 --- a/experimental/Media Player/main.qml +++ b/basicsuite/Media Player/main.qml diff --git a/basicsuite/basicsuite.pro b/basicsuite/basicsuite.pro index 94c80b3..2729de4 100644 --- a/basicsuite/basicsuite.pro +++ b/basicsuite/basicsuite.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ Qt5Everywhere \ + Camera diff --git a/experimental/experimental.pro b/experimental/experimental.pro deleted file mode 100644 index d067cd5..0000000 --- a/experimental/experimental.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += \ - Camera |