Merge pull request #35 from CodeHoarder/master

Beta4 BB samples

SensorDemo/Makefile

@@ -11,8 +11,8 @@ clean:
 
 
 Makefile: FORCE
-	$(QMAKE) -spec unsupported/blackberry-armv7le-g++ -o arm/Makefile $(QMAKE_TARGET).pro CONFIG+=device
-	$(QMAKE) -spec unsupported/blackberry-x86-g++ -o x86/Makefile $(QMAKE_TARGET).pro CONFIG+=simulator
+	$(QMAKE) -spec blackberry-armv7le-qcc -o arm/Makefile $(QMAKE_TARGET).pro CONFIG+=device
+	$(QMAKE) -spec blackberry-x86-qcc -o x86/Makefile $(QMAKE_TARGET).pro CONFIG+=simulator
 	$(MAKE) -C ./translations -f Makefile update release
 
 FORCE:

SensorDemo/SensorDemo.pro

@@ -19,6 +19,8 @@ lupdate_inclusion {
 device {
     CONFIG(release, debug|release) {
         DESTDIR = o.le-v7
+        TEMPLATE = lib
+        QMAKE_CXXFLAGS_RELEASE += -fvisibility=hidden -mthumb
     }
     CONFIG(debug, debug|release) {
         DESTDIR = o.le-v7-g

SensorDemo/assets/main.qml

@@ -31,7 +31,7 @@ TabbedPane {
 //! [1]
     Tab {
         id: alarmTab
-        title: qsTr("Motion Alarm")
+        title: qsTr("Motion Sensor")
         imageSource: "images/alarm.png"
 
         Page {
@@ -71,8 +71,8 @@ TabbedPane {
 
     Tab {
         id: flashlightTab
-        title: qsTr("Flashlight")
-        imageSource: "images/flashlight.png"
+        title: qsTr("Night Lamp")
+        imageSource: "images/nightlamp.png"
 
         Page {
             ControlDelegate {
@@ -84,7 +84,7 @@ TabbedPane {
 
     Tab {
         id: collisionDetectorTab
-        title: qsTr("Collision Detector")
+        title: qsTr("Collision Detection")
         imageSource: "images/crash.png"
 
         Page {

SensorDemo/bar-descriptor.xml

@@ -67,11 +67,8 @@
 
     <!--  The category where the application appears. Either core.games or core.media. -->
     <category>core.games</category>
-    <splashScreens>
-       <image>rotation3d.png</image>
-    </splashScreens>
     <icon>
-       <image>rotation3d.png</image>
+       <image>assets/images/rotation3d.png</image>
     </icon>
     <configuration id="com.qnx.qcc.toolChain.1914788226" name="Default">
        <platformArchitecture>armle-v7</platformArchitecture>
@@ -80,10 +77,12 @@
     <configuration id="com.qnx.qcc.toolChain.476274684" name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>
        <asset path="arm/o.le-v7-g/SensorDemo" entry="true" type="Qnx/Elf">SensorDemo</asset>
+       <entryPointType>Qnx/Elf</entryPointType>
     </configuration>
     <configuration id="com.qnx.qcc.toolChain.1999582179" name="Device-Release">
        <platformArchitecture>armle-v7</platformArchitecture>
-       <asset path="arm/o.le-v7/SensorDemo" entry="true" type="Qnx/Elf">SensorDemo</asset>
+       <asset path="arm/o.le-v7/libSensorDemo.so.1.0.0" entry="true" type="Qnx/Elf">SensorDemo.so</asset>
+       <entryPointType>Qnx/Cascades</entryPointType>
     </configuration>
     <configuration id="com.qnx.qcc.toolChain.1067285528" name="Simulator-Debug">
        <platformArchitecture>x86</platformArchitecture>
@@ -98,7 +97,6 @@
     <asset path="translations" dest="qm">
         <include name="*.qm"/>
     </asset>
-    <asset path="assets/images/rotation3d.png">rotation3d.png</asset>
 
     <!-- Request permission to execute native code.  Required for native applications. -->
     <permission system="true">run_native</permission>

SensorDemo/readme.txt

@@ -0,0 +1,44 @@
+SensorDemo
+
+========================================================================
+Sample Description.
+
+The Sensor Demo example is a collection of pages where each page demonstrate
+how to retrieve and process data from a certain hardware sensor.
+
+You will learn how to:
+- Use the Compass element to read values from the hardware compass sensor
+- Use the Accelerometer element to read values fr0m the hardware accelerometer sensor
+- Use the Magnetometer element to read values from the hardware magnetometer sensor
+- How to use the AmbientLight sensor and Light sensor
+- How to read values from the Gyroscope sensor
+- How to use the Camera api to control the camera flash
+- How to read values from the IRProximity sensor
+- How to read values from the Proximity sensor
+- How to read values from the Rotation sensor
+- Use animations on Controls
+- Trigger C++ functions from QML
+- Property binding
+
+========================================================================
+Requirements:
+
+BlackBerry 10 Native SDK Beta 4
+
+========================================================================
+Running the example:
+
+1. Clone the Sample repository.
+2. Launch BlackBerry 10 Native SDK Beta, and from the File menu, select Import.
+3. Expand General, and select Existing Projects into Workspace. Click Next.
+4. Browse to the location of your sample directory, and then click OK.
+5. The sample project should display in the Projects section. 
+   Click Finish to import the project into your workspace.
+6. In the Project Explorer pane, Right-click the project (for example hellocascades) 
+   and select Build Project.
+7. In the Project Explorer pane, Right-click the project (for example hellocascades) 
+   and select Run As > BlackBerry C/C++ Application.
+8. The application will now install and launch on your device if not you might
+   have to set up your environment: 
+   http://developer.blackberry.com/cascades/documentation/getting_started/setting_up.html
+

SensorDemo/src/Flashlight.hpp

@@ -40,8 +40,10 @@ class Flashlight: public QObject
     void enabledChanged(bool);
 
 private:
-    // The 
+    // The property value
     bool m_enabled;
+
+    // The handle for the camera device
     camera_handle_t m_camera;
 };
 

SensorDemo/src/main.cpp

@@ -26,7 +26,7 @@
 using namespace bb::cascades;
 using namespace bb::device;
 
-int main(int argc, char **argv)
+Q_DECL_EXPORT int main(int argc, char **argv)
 {
     Application app(argc, argv);
 

SensorsAccelGame/Makefile → accelgame/Makefile

@@ -11,8 +11,8 @@ clean:
 
 
 Makefile: FORCE
-	$(QMAKE) -spec unsupported/blackberry-armv7le-g++ -o arm/Makefile $(QMAKE_TARGET).pro CONFIG+=device
-	$(QMAKE) -spec unsupported/blackberry-x86-g++ -o x86/Makefile $(QMAKE_TARGET).pro CONFIG+=simulator
+	$(QMAKE) -spec blackberry-armv7le-qcc -o arm/Makefile $(QMAKE_TARGET).pro CONFIG+=device
+	$(QMAKE) -spec blackberry-x86-qcc -o x86/Makefile $(QMAKE_TARGET).pro CONFIG+=simulator
 
 FORCE:
 

SensorsAccelGame/accelgame.pro → accelgame/accelgame.pro

@@ -15,6 +15,8 @@ lupdate_inclusion {
 device {
     CONFIG(release, debug|release) {
         DESTDIR = o.le-v7
+        TEMPLATE = lib
+        QMAKE_CXXFLAGS_RELEASE += -fvisibility=hidden -mthumb
     }
     CONFIG(debug, debug|release) {
         DESTDIR = o.le-v7-g