Skip to content

Commit

Permalink
10.2 sample refresh
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Sosnowski committed Aug 16, 2013
1 parent e58f39f commit 396092a
Show file tree
Hide file tree
Showing 378 changed files with 8,009 additions and 914 deletions.
2 changes: 1 addition & 1 deletion SensorDemo/assets/collisiondetector.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import bb.multimedia 1.0
import QtMobility.sensors 1.2

Expand Down
2 changes: 1 addition & 1 deletion SensorDemo/assets/compass.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import QtMobility.sensors 1.2
import bb.vibrationController 1.0

Expand Down
2 changes: 1 addition & 1 deletion SensorDemo/assets/flashlight.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import QtMobility.sensors 1.2
import Flashlight 1.0

Expand Down
2 changes: 1 addition & 1 deletion SensorDemo/assets/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import QtMobility.sensors 1.2

TabbedPane {
Expand Down
2 changes: 1 addition & 1 deletion SensorDemo/assets/metalfinder.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import QtMobility.sensors 1.2
import bb.vibrationController 1.0

Expand Down
2 changes: 1 addition & 1 deletion SensorDemo/assets/motionalarm.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import bb.multimedia 1.0
import QtMobility.sensors 1.2

Expand Down
2 changes: 1 addition & 1 deletion SensorDemo/assets/rotation3D.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import bb.multimedia 1.0
import QtMobility.sensors 1.2

Expand Down
2 changes: 1 addition & 1 deletion accelgame/assets/Maze.qml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

Container {
// The size is defined by the background image
Expand Down
2 changes: 1 addition & 1 deletion accelgame/assets/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

Page {
onCreationCompleted: {
Expand Down
2 changes: 1 addition & 1 deletion accounts/assets/720x720/BackgroundImage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

ImageView {
imageSource: "asset:///images/background.amd"
Expand Down
2 changes: 1 addition & 1 deletion accounts/assets/AccountEditor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import com.example.bb10samples.pim.accounts 1.0

Page {
Expand Down
2 changes: 1 addition & 1 deletion accounts/assets/AccountViewer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

Page {
id: root
Expand Down
2 changes: 1 addition & 1 deletion accounts/assets/BackgroundImage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

ImageView {
imageSource: "asset:///images/background.png"
Expand Down
2 changes: 1 addition & 1 deletion accounts/assets/EditorField.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

//! [0]
Container {
Expand Down
2 changes: 1 addition & 1 deletion accounts/assets/ViewerField.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

Container {
property alias title: titleField.text
Expand Down
2 changes: 1 addition & 1 deletion accounts/assets/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

NavigationPane {
id: navigationPane
Expand Down
2 changes: 1 addition & 1 deletion addressbook/assets/720x720/AddressbookScrollView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import bb.cascades 1.0
import bb.cascades 1.2

// For the 720x720 resolution a ScrollView is used, for the standard
// resolution this would lead to rubberbanding of a full screen UI
Expand Down
2 changes: 1 addition & 1 deletion addressbook/assets/720x720/BackgroundImage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

ImageView {
imageSource: "asset:///images/background.amd"
Expand Down
2 changes: 1 addition & 1 deletion addressbook/assets/AddressbookScrollView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import bb.cascades 1.0
import bb.cascades 1.2

// In the default resolution we do not add a scroll to the UI, since we do
// not want rubberbanding at the top and bottom. For a smaller screen this
Expand Down
2 changes: 1 addition & 1 deletion addressbook/assets/BackgroundImage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

ImageView {
imageSource: "asset:///images/background.png"
Expand Down
2 changes: 1 addition & 1 deletion addressbook/assets/ContactEditor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import com.example.bb10samples.pim.addressbook 1.0

Page {
Expand Down
2 changes: 1 addition & 1 deletion addressbook/assets/ContactViewer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

Page {
id: root
Expand Down
2 changes: 1 addition & 1 deletion addressbook/assets/ViewerField.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

Container {
property alias title: titleField.text
Expand Down
2 changes: 1 addition & 1 deletion addressbook/assets/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

NavigationPane {
id: navigationPane
Expand Down
2 changes: 1 addition & 1 deletion bannerads/assets/720x720/BanneradsScrollView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import bb.cascades 1.0
import bb.cascades 1.2

// For the 720x720 resolution a ScrollView is used, for the standard
// resolution this would lead to rubberbanding of a full screen UI
Expand Down
2 changes: 1 addition & 1 deletion bannerads/assets/720x720/WeatherIcon.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

ImageView {
preferredWidth: 300
Expand Down
2 changes: 1 addition & 1 deletion bannerads/assets/BanneradsScrollView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import bb.cascades 1.0
import bb.cascades 1.2

// In the default resolution we do not add a scroll to the UI, since we do
// not want rubberbanding at the top and bottom. For a smaller screen this
Expand Down
2 changes: 1 addition & 1 deletion bannerads/assets/LabeledLabel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

// this is a custom control allowing for labeled Labels
Container {
Expand Down
2 changes: 1 addition & 1 deletion bannerads/assets/Weather.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

//! [0]
// This container lays out visual components of a mock weather application
Expand Down
2 changes: 1 addition & 1 deletion bannerads/assets/WeatherIcon.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

ImageView {
}
2 changes: 1 addition & 1 deletion bannerads/assets/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import bb.cascades.advertisement 1.0

// TabbedPane laying out the visual components
Expand Down
2 changes: 1 addition & 1 deletion barcodereader/assets/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import bb.cascades.multimedia 1.0
import bb.multimedia 1.0

Expand Down
25 changes: 0 additions & 25 deletions batterysample/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -175,28 +175,3 @@
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
2 changes: 1 addition & 1 deletion batterysample/assets/Battery.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import bb.device 1.0

Container {
Expand Down
2 changes: 1 addition & 1 deletion batterysample/assets/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import bb.device 1.0

// Page laying out the visual components
Expand Down
2 changes: 1 addition & 1 deletion bbmcontacts/assets/720x720/ContactScrollView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import bb.cascades 1.0
import bb.cascades 1.2

// For the 720x720 resolution a ScrollView is used, for the standard
// resolution this would lead to rubberbanding of a full screen UI
Expand Down
2 changes: 1 addition & 1 deletion bbmcontacts/assets/ContactItem.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
//! [0]
// Container that represents a Contact in the ListView
Container {
Expand Down
2 changes: 1 addition & 1 deletion bbmcontacts/assets/ContactList.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

// The main page displaying the number of contacts that have
// this application installed and a list of the contacts.
Expand Down
2 changes: 1 addition & 1 deletion bbmcontacts/assets/ContactPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2
import com.example.contact 1.0

// Page for displaying Contact details
Expand Down
2 changes: 1 addition & 1 deletion bbmcontacts/assets/ContactScrollView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import bb.cascades 1.0
import bb.cascades 1.2

// In the default resolution we do not add a scroll to the UI, since we do
// not want rubberbanding at the top and bottom. For a smaller screen this
Expand Down
2 changes: 1 addition & 1 deletion bbmcontacts/assets/Field.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

// Custom component mimicking a labeled field
Container {
Expand Down
2 changes: 1 addition & 1 deletion bbmcontacts/assets/Registration.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import bb.cascades 1.0
import bb.cascades 1.2

// Page dealing with bbm registration
NavigationPane {
Expand Down
Loading

0 comments on commit 396092a

Please sign in to comment.