Skip to content

Commit ceed0f7

Browse files
kylefowlerkylefowler
committed
update to gold sdk
1 parent aba817d commit ceed0f7

32 files changed

+222
-1113
lines changed

‎.cproject

+77-104
Large diffs are not rendered by default.

‎.project

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>twitter</name>
3+
<name>twitter-bb10</name>
44
<comment></comment>
55
<projects>
66
</projects>
77
<buildSpec>
88
<buildCommand>
99
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
10-
<triggers>clean,full,incremental,</triggers>
1110
<arguments>
1211
<dictionary>
1312
<key>?name?</key>
@@ -19,7 +18,7 @@
1918
</dictionary>
2019
<dictionary>
2120
<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
22-
<value>all</value>
21+
<value>Device-Debug</value>
2322
</dictionary>
2423
<dictionary>
2524
<key>org.eclipse.cdt.make.core.buildArguments</key>
@@ -39,7 +38,7 @@
3938
</dictionary>
4039
<dictionary>
4140
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
42-
<value>false</value>
41+
<value>true</value>
4342
</dictionary>
4443
<dictionary>
4544
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
@@ -51,7 +50,7 @@
5150
</dictionary>
5251
<dictionary>
5352
<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
54-
<value>all</value>
53+
<value>Device-Debug</value>
5554
</dictionary>
5655
<dictionary>
5756
<key>org.eclipse.cdt.make.core.stopOnError</key>
@@ -63,24 +62,30 @@
6362
</dictionary>
6463
</arguments>
6564
</buildCommand>
65+
<buildCommand>
66+
<name>com.rim.tad.tools.wst.jsdt.core.javascriptValidator</name>
67+
<arguments>
68+
</arguments>
69+
</buildCommand>
6670
<buildCommand>
6771
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
6872
<triggers>full,incremental,</triggers>
6973
<arguments>
7074
</arguments>
7175
</buildCommand>
7276
<buildCommand>
73-
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
77+
<name>com.rim.tad.tools.qml.core.qmlFileBuilder</name>
7478
<arguments>
7579
</arguments>
7680
</buildCommand>
7781
<buildCommand>
78-
<name>com.rim.tad.tools.qml.core.qmlFileBuilder</name>
82+
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
7983
<arguments>
8084
</arguments>
8185
</buildCommand>
8286
</buildSpec>
8387
<natures>
88+
<nature>com.rim.tad.tools.wst.jsdt.core.jsNature</nature>
8489
<nature>org.eclipse.cdt.core.cnature</nature>
8590
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
8691
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>

‎.settings/org.eclipse.cdt.core.prefs

+32-25
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
1-
#Thu Apr 05 22:43:06 PDT 2012
21
eclipse.preferences.version=1
3-
environment/project/com.qnx.qcc.toolChain.1343095002/CPULIST/delimiter=,
4-
environment/project/com.qnx.qcc.toolChain.1343095002/CPULIST/operation=append
5-
environment/project/com.qnx.qcc.toolChain.1343095002/CPULIST/value=x86
6-
environment/project/com.qnx.qcc.toolChain.1343095002/VARIANTLIST/delimiter=,
7-
environment/project/com.qnx.qcc.toolChain.1343095002/VARIANTLIST/operation=append
8-
environment/project/com.qnx.qcc.toolChain.1343095002/VARIANTLIST/value=g
9-
environment/project/com.qnx.qcc.toolChain.1343095002/append=true
10-
environment/project/com.qnx.qcc.toolChain.1343095002/appendContributed=true
11-
environment/project/com.qnx.qcc.toolChain.499878132/CPULIST/delimiter=,
12-
environment/project/com.qnx.qcc.toolChain.499878132/CPULIST/operation=append
13-
environment/project/com.qnx.qcc.toolChain.499878132/CPULIST/value=arm
14-
environment/project/com.qnx.qcc.toolChain.499878132/EXCLUDE_VARIANTLIST/delimiter=,
15-
environment/project/com.qnx.qcc.toolChain.499878132/EXCLUDE_VARIANTLIST/operation=append
16-
environment/project/com.qnx.qcc.toolChain.499878132/EXCLUDE_VARIANTLIST/value=r
17-
environment/project/com.qnx.qcc.toolChain.499878132/append=true
18-
environment/project/com.qnx.qcc.toolChain.499878132/appendContributed=true
19-
environment/project/com.qnx.qcc.toolChain.991594164/CPULIST/delimiter=,
20-
environment/project/com.qnx.qcc.toolChain.991594164/CPULIST/operation=append
21-
environment/project/com.qnx.qcc.toolChain.991594164/CPULIST/value=arm
22-
environment/project/com.qnx.qcc.toolChain.991594164/VARIANTLIST/delimiter=,
23-
environment/project/com.qnx.qcc.toolChain.991594164/VARIANTLIST/operation=append
24-
environment/project/com.qnx.qcc.toolChain.991594164/VARIANTLIST/value=g
25-
environment/project/com.qnx.qcc.toolChain.991594164/append=true
26-
environment/project/com.qnx.qcc.toolChain.991594164/appendContributed=true
2+
environment/project/com.qnx.qcc.toolChain.1228015781/CPULIST/delimiter=,
3+
environment/project/com.qnx.qcc.toolChain.1228015781/CPULIST/operation=append
4+
environment/project/com.qnx.qcc.toolChain.1228015781/CPULIST/value=arm
5+
environment/project/com.qnx.qcc.toolChain.1228015781/EXCLUDE_VARIANTLIST/delimiter=,
6+
environment/project/com.qnx.qcc.toolChain.1228015781/EXCLUDE_VARIANTLIST/operation=append
7+
environment/project/com.qnx.qcc.toolChain.1228015781/EXCLUDE_VARIANTLIST/value=p
8+
environment/project/com.qnx.qcc.toolChain.1228015781/append=true
9+
environment/project/com.qnx.qcc.toolChain.1228015781/appendContributed=true
10+
environment/project/com.qnx.qcc.toolChain.275975479/CPULIST/delimiter=,
11+
environment/project/com.qnx.qcc.toolChain.275975479/CPULIST/operation=append
12+
environment/project/com.qnx.qcc.toolChain.275975479/CPULIST/value=arm
13+
environment/project/com.qnx.qcc.toolChain.275975479/VARIANTLIST/delimiter=,
14+
environment/project/com.qnx.qcc.toolChain.275975479/VARIANTLIST/operation=append
15+
environment/project/com.qnx.qcc.toolChain.275975479/VARIANTLIST/value=g
16+
environment/project/com.qnx.qcc.toolChain.275975479/append=true
17+
environment/project/com.qnx.qcc.toolChain.275975479/appendContributed=true
18+
environment/project/com.qnx.qcc.toolChain.324155159/CPULIST/delimiter=,
19+
environment/project/com.qnx.qcc.toolChain.324155159/CPULIST/operation=append
20+
environment/project/com.qnx.qcc.toolChain.324155159/CPULIST/value=arm
21+
environment/project/com.qnx.qcc.toolChain.324155159/EXCLUDE_VARIANTLIST/delimiter=,
22+
environment/project/com.qnx.qcc.toolChain.324155159/EXCLUDE_VARIANTLIST/operation=append
23+
environment/project/com.qnx.qcc.toolChain.324155159/EXCLUDE_VARIANTLIST/value=r
24+
environment/project/com.qnx.qcc.toolChain.324155159/append=true
25+
environment/project/com.qnx.qcc.toolChain.324155159/appendContributed=true
26+
environment/project/com.qnx.qcc.toolChain.97183577/CPULIST/delimiter=,
27+
environment/project/com.qnx.qcc.toolChain.97183577/CPULIST/operation=append
28+
environment/project/com.qnx.qcc.toolChain.97183577/CPULIST/value=x86
29+
environment/project/com.qnx.qcc.toolChain.97183577/VARIANTLIST/delimiter=,
30+
environment/project/com.qnx.qcc.toolChain.97183577/VARIANTLIST/operation=append
31+
environment/project/com.qnx.qcc.toolChain.97183577/VARIANTLIST/value=g
32+
environment/project/com.qnx.qcc.toolChain.97183577/append=true
33+
environment/project/com.qnx.qcc.toolChain.97183577/appendContributed=true

‎Makefile

+4-33
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,6 @@
1-
QMAKE_TARGET = twitter
2-
QMAKE = $(QNX_HOST)/usr/bin/qmake
3-
TARGET = $(QMAKE_TARGET)
1+
QMAKE_TARGET = twitter_bb10
2+
PROJECT_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
3+
I18N_DIR := $(PROJECT_DIR)/translations
44

5+
include mk/cs-base.mk
56

6-
all: Makefile $(QMAKE_TARGET)
7-
8-
clean:
9-
$(MAKE) -C ./arm -f Makefile sureclean
10-
$(MAKE) -C ./x86 -f Makefile sureclean
11-
12-
13-
Makefile: FORCE
14-
$(QMAKE) -spec unsupported/blackberry-armv7le-g++ -o arm/Makefile $(QMAKE_TARGET).pro CONFIG+=device
15-
$(QMAKE) -spec unsupported/blackberry-x86-g++ -o x86/Makefile $(QMAKE_TARGET).pro CONFIG+=simulator
16-
$(MAKE) -C ./translations -f Makefile update release
17-
18-
FORCE:
19-
20-
$(QMAKE_TARGET): device simulator
21-
22-
device:
23-
$(MAKE) -C ./arm -f Makefile all
24-
25-
Device-Debug: Makefile
26-
$(MAKE) -C ./arm -f Makefile debug
27-
28-
Device-Release: Makefile
29-
$(MAKE) -C ./arm -f Makefile release
30-
31-
simulator:
32-
$(MAKE) -C ./x86 -f Makefile all
33-
34-
Simulator-Debug: Makefile
35-
$(MAKE) -C ./x86 -f Makefile debug

‎assets/.DS_Store

6 KB
Binary file not shown.

‎assets/.preview-9056439404334521805qml~

-54
This file was deleted.

‎bar-descriptor.xml

+13-26
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
<!-- A universally unique application identifier. Must be unique across all BlackBerry Tablet OS applications.
2828
Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
29-
<id>com.example.twitter</id>
29+
<id>com.example.twitter_bb10</id>
3030

3131
<!-- The name that is displayed in the BlackBerry Tablet OS application installer.
3232
May have multiple values for each language. See samples or xsd schema file. Optional. -->
33-
<name>twitter</name>
33+
<name>twitter-bb10</name>
3434

3535
<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
3636
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
@@ -46,7 +46,7 @@
4646

4747
<!-- Description, displayed in the BlackBerry Tablet OS application installer.
4848
May have multiple values for each language. See samples or xsd schema file. Optional. -->
49-
<description>The twitter application</description>
49+
<description>The twitter-bb10 application</description>
5050

5151
<!-- Copyright information. Optional. -->
5252
<!-- <copyright></copyright> -->
@@ -63,22 +63,23 @@
6363
</initialWindow>
6464

6565
<!-- The category where the application appears. Either core.games or core.media. -->
66-
<category>core.media</category>
67-
<configuration id="com.qnx.qcc.toolChain.419701189" name="Default">
66+
<category>core.games</category>
67+
<configuration name="Device-Debug">
6868
<platformArchitecture>armle-v7</platformArchitecture>
69-
<asset path="arm/o.le-v7-g/twitter" entry="true" type="Qnx/Elf">twitter</asset>
69+
<asset path="arm/o.le-v7-g/twitter-bb10" entry="true" type="Qnx/Elf">twitter-bb10</asset>
7070
</configuration>
71-
<configuration id="com.qnx.qcc.toolChain.991594164" name="Device-Debug">
71+
<configuration name="Device-Release">
72+
<entryPointType>Qnx/Cascades</entryPointType>
7273
<platformArchitecture>armle-v7</platformArchitecture>
73-
<asset path="arm/o.le-v7-g/twitter" entry="true" type="Qnx/Elf">twitter</asset>
74+
<asset path="arm/o.le-v7/twitter_bb10.so" entry="true" type="Qnx/Elf">twitter_bb10.so</asset>
7475
</configuration>
75-
<configuration id="com.qnx.qcc.toolChain.499878132" name="Device-Release">
76+
<configuration name="Device-Profile">
7677
<platformArchitecture>armle-v7</platformArchitecture>
77-
<asset path="arm/o.le-v7/twitter" entry="true" type="Qnx/Elf">twitter</asset>
78+
<asset path="arm-p/o.le-v7-g/twitter_bb10" entry="true" type="Qnx/Elf">twitter_bb10</asset>
7879
</configuration>
79-
<configuration id="com.qnx.qcc.toolChain.1343095002" name="Simulator-Debug">
80+
<configuration name="Simulator-Debug">
8081
<platformArchitecture>x86</platformArchitecture>
81-
<asset path="x86/o-g/twitter" entry="true" type="Qnx/Elf">twitter</asset>
82+
<asset path="x86/o-g/twitter_bb10" entry="true" type="Qnx/Elf">twitter_bb10</asset>
8283
</configuration>
8384

8485
<!-- The icon for the application, which should be 86x86. -->
@@ -88,8 +89,6 @@
8889

8990
<asset path="icon.png">icon.png</asset>
9091
<asset path="assets">assets</asset>
91-
<!-- The splash screen that will appear when your application is launching. Should be 1024x600. -->
92-
<!-- <splashscreen></splashscreen> -->
9392

9493
<!-- Locale support -->
9594
<asset path="translations" dest="qm">
@@ -98,18 +97,6 @@
9897

9998
<!-- Request permission to execute native code. Required for native applications. -->
10099
<permission system="true">run_native</permission>
101-
<permission>access_internet</permission>
102100
<env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib"/>
103101

104-
<!-- The permissions requested by your application. -->
105-
<!-- <action>access_shared</action> -->
106-
<!-- <action>record_audio</action> -->
107-
<!-- <action>read_geolocation</action> -->
108-
<!-- <action>use_camera</action> -->
109-
<!-- <action>access_internet</action> -->
110-
<!-- <action>play_audio</action> -->
111-
<!-- <action>post_notification</action> -->
112-
<!-- <action>set_audio_volume</action> -->
113-
<!-- <action>read_device_identifying_information</action> -->
114-
115102
</qnx>

‎config.pri

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Auto-generated by IDE. All changes by user will be lost!
2+
# Created at 1/20/13 3:28 PM
3+
4+
BASEDIR = $$_PRO_FILE_PWD_
5+
6+
QT += network
7+
8+
LIBS += -lbbdata
9+
10+
INCLUDEPATH += \
11+
$$BASEDIR/src/oauth \
12+
$$BASEDIR/src
13+
14+
SOURCES += \
15+
$$BASEDIR/src/AbstractObjectBase.cpp \
16+
$$BASEDIR/src/ApiResponse.cpp \
17+
$$BASEDIR/src/ApiResponseObjectFactory.cpp \
18+
$$BASEDIR/src/HomeLayout.cpp \
19+
$$BASEDIR/src/LoginLayout.cpp \
20+
$$BASEDIR/src/RequestEnvelope.cpp \
21+
$$BASEDIR/src/ResponseMeta.cpp \
22+
$$BASEDIR/src/Tweet.cpp \
23+
$$BASEDIR/src/Twitter.cpp \
24+
$$BASEDIR/src/TwitterApi.cpp \
25+
$$BASEDIR/src/User.cpp \
26+
$$BASEDIR/src/oauth/kqoauth2request.cpp \
27+
$$BASEDIR/src/oauth/kqoauthauthreplyserver.cpp \
28+
$$BASEDIR/src/oauth/kqoauthmanager.cpp \
29+
$$BASEDIR/src/oauth/kqoauthrequest.cpp \
30+
$$BASEDIR/src/oauth/kqoauthrequest_1.cpp \
31+
$$BASEDIR/src/oauth/kqoauthrequest_xauth.cpp \
32+
$$BASEDIR/src/oauth/kqoauthutils.cpp \
33+
$$BASEDIR/src/twittermain.cpp
34+
35+
HEADERS += \
36+
$$BASEDIR/src/AbstractObjectBase.h \
37+
$$BASEDIR/src/ApiResponse.h \
38+
$$BASEDIR/src/ApiResponseObjectFactory.h \
39+
$$BASEDIR/src/HomeLayout.h \
40+
$$BASEDIR/src/LoginLayout.h \
41+
$$BASEDIR/src/RequestEnvelope.h \
42+
$$BASEDIR/src/ResponseMeta.h \
43+
$$BASEDIR/src/Tweet.h \
44+
$$BASEDIR/src/Twitter.hpp \
45+
$$BASEDIR/src/TwitterApi.h \
46+
$$BASEDIR/src/User.h \
47+
$$BASEDIR/src/oauth/kqoauth2request.h \
48+
$$BASEDIR/src/oauth/kqoauth2request_p.h \
49+
$$BASEDIR/src/oauth/kqoauthauthreplyserver.h \
50+
$$BASEDIR/src/oauth/kqoauthauthreplyserver_p.h \
51+
$$BASEDIR/src/oauth/kqoauthglobals.h \
52+
$$BASEDIR/src/oauth/kqoauthmanager.h \
53+
$$BASEDIR/src/oauth/kqoauthmanager_p.h \
54+
$$BASEDIR/src/oauth/kqoauthrequest.h \
55+
$$BASEDIR/src/oauth/kqoauthrequest_1.h \
56+
$$BASEDIR/src/oauth/kqoauthrequest_p.h \
57+
$$BASEDIR/src/oauth/kqoauthrequest_xauth.h \
58+
$$BASEDIR/src/oauth/kqoauthrequest_xauth_p.h \
59+
$$BASEDIR/src/oauth/kqoauthutils.h
60+
61+
CONFIG += precompile_header
62+
PRECOMPILED_HEADER = $$BASEDIR/precompiled.h
63+
64+
lupdate_inclusion {
65+
SOURCES += \
66+
$$BASEDIR/../assets/*.qml
67+
}
68+
69+
TRANSLATIONS = \
70+
$${TARGET}.ts
71+

‎device-assets.xml

-4
This file was deleted.

‎precompiled.h

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// This file is used to store precompiled headers.
2+
// It is intentionally left blank. It is up to you to decide which headers should be included here.

‎src/.DS_Store

6 KB
Binary file not shown.

0 commit comments

Comments
 (0)