Skip to content

Commit

Permalink
changes to revert back to include cascades 1.0 in qml
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Sosnowski committed Aug 27, 2013
1 parent c85cbe3 commit 8295949
Show file tree
Hide file tree
Showing 453 changed files with 480 additions and 472 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.2
import bb.cascades 1.0
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.2
import bb.cascades 1.0
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.2
import bb.cascades 1.0
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.2
import bb.cascades 1.0
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.2
import bb.cascades 1.0
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.2
import bb.cascades 1.0
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.2
import bb.cascades 1.0
import bb.multimedia 1.0
import QtMobility.sensors 1.2

Expand Down
2 changes: 1 addition & 1 deletion SensorDemo/src/Flashlight.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion SensorDemo/src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0

Page {
onCreationCompleted: {
Expand Down
2 changes: 1 addition & 1 deletion accelgame/src/accelerationsensor.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accelgame/src/board.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accelgame/src/gamecontroller.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accelgame/src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accelgame/src/player.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2012 Research In Motion Limited.
* Copyright (c) 2011, 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0
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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0

//! [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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0

NavigationPane {
id: navigationPane
Expand Down
2 changes: 1 addition & 1 deletion accounts/src/AccountEditor.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accounts/src/AccountViewer.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accounts/src/Accounts.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion accounts/src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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.2
import bb.cascades 1.0

// 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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0

// 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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0
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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0

NavigationPane {
id: navigationPane
Expand Down
2 changes: 1 addition & 1 deletion addressbook/src/AddressBook.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion addressbook/src/ContactEditor.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion addressbook/src/ContactViewer.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion addressbook/src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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.2
import bb.cascades 1.0

// 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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0

// 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.2
import bb.cascades 1.0

// 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.2
import bb.cascades 1.0

//! [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.2
import bb.cascades 1.0

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.2
import bb.cascades 1.0
import bb.cascades.advertisement 1.0

// TabbedPane laying out the visual components
Expand Down
2 changes: 1 addition & 1 deletion bannerads/src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
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.2
import bb.cascades 1.0
import bb.cascades.multimedia 1.0
import bb.multimedia 1.0

Expand Down
2 changes: 1 addition & 1 deletion barcodereader/src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2012 Research In Motion Limited.
/* Copyright (c) 2012, 2013 BlackBerry Limited.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit 8295949

Please sign in to comment.