summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.s608
-rwxr-xr-xbin/createpackage.pl4
-rwxr-xr-xbin/patch_capabilities.pl2
-rwxr-xr-xconfigure.exebin2170880 -> 1169408 bytes
-rw-r--r--doc/src/snippets/code/doc_src_s60-introduction.qdoc6
-rw-r--r--qmake/generators/symbian/symmake_abld.cpp6
-rw-r--r--qmake/generators/symbian/symmake_sbsv2.cpp6
-rw-r--r--tools/configure/configureapp.cpp2
8 files changed, 17 insertions, 17 deletions
diff --git a/README.s60 b/README.s60
index 2137135..87259c1 100644
--- a/README.s60
+++ b/README.s60
@@ -148,7 +148,7 @@ many example programs in Qt's examples directory.
To build Qt for the device, type:
- make release-armv5
+ make release-armv6
Congratulations, Qt is now ready to use.
@@ -159,7 +159,7 @@ many example programs in Qt's examples directory.
a real device, you first have to install the Qt libraries on the device:
cd src\s60installs
- createpackage -i Qt_for_S60_template.pkg release-armv5 <certificate file> <certificate key file>
+ createpackage -i Qt_for_S60_template.pkg release-armv6 <certificate file> <certificate key file>
Note: You will need to supply certificate that allows installation of
binaries with "All -Tcb" capability to your device.
@@ -167,9 +167,9 @@ many example programs in Qt's examples directory.
Similarly, install fluidlauncher to the device:
cd embedded\fluidlauncher
- createpackage -i fluidlauncher_template.pkg release-armv5
+ createpackage -i fluidlauncher_template.pkg release-armv6
- This will create a self-signed fluidlauncher_release-armv5.sis and install it to your device.
+ This will create a self-signed fluidlauncher_release-armv6.sis and install it to your device.
To run the demos on the emulator simply navigate to the directory of the demo and run:
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 7e87758..fe141d7 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -85,10 +85,10 @@ Where parameters are as follows:
passphrase = The certificate's private key file's passphrase
Example:
- createpackage.pl fluidlauncher_template.pkg release-armv5
+ createpackage.pl fluidlauncher_template.pkg release-armv6
Example with certfile:
- createpackage.pl -c=mycerts.txt fluidlauncher_template.pkg release-armv5
+ createpackage.pl -c=mycerts.txt fluidlauncher_template.pkg release-armv6
Content of 'mycerts.txt' must be something like this:
# This is comment line, also the empty lines are ignored
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index bfd34f0..e570632 100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -53,7 +53,7 @@ sub Usage() {
print("capabilities supported by self-signed certificates.\n");
print("\n *** NOTE: If *_template.pkg file is given, 'target-platform' is REQUIRED. ***\n");
print("\nUsage: patch_capabilities.pl pkg_filename <target-platform> [capability list]\n");
- print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv5 \"All -TCB\"\n");
+ print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv6 \"All -TCB\"\n");
exit();
}
diff --git a/configure.exe b/configure.exe
index dabf10c..fc95f90 100755
--- a/configure.exe
+++ b/configure.exe
Binary files differ
diff --git a/doc/src/snippets/code/doc_src_s60-introduction.qdoc b/doc/src/snippets/code/doc_src_s60-introduction.qdoc
index 8949df6..c9c6fd9 100644
--- a/doc/src/snippets/code/doc_src_s60-introduction.qdoc
+++ b/doc/src/snippets/code/doc_src_s60-introduction.qdoc
@@ -50,16 +50,16 @@
//! [2]
qmake
- make debug-winscw release-armv5
+ make debug-winscw release-armv6
make sis
//! [2]
//! [3]
- make sis QT_SIS_TARGET=debug-armv5
+ make sis QT_SIS_TARGET=debug-armv6
//! [3]
//! [4]
- set QT_SIS_TARGET=debug-armv5
+ set QT_SIS_TARGET=debug-armv6
make sis
//! [4]
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 4d1673b..692ead7 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -224,8 +224,8 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
t << "first: default" << endl;
if (debugPlatforms.contains("winscw"))
t << "default: debug-winscw";
- else if (debugPlatforms.contains("armv5"))
- t << "default: debug-armv5";
+ else if (debugPlatforms.contains("armv6"))
+ t << "default: debug-armv6";
else if (debugPlatforms.size())
t << "default: debug-" << debugPlatforms.first();
else
@@ -259,7 +259,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
}
t << endl;
- // For more specific builds, targets are in this form: build-platform, e.g. release-armv5
+ // For more specific builds, targets are in this form: build-platform, e.g. release-armv6
foreach(QString item, debugPlatforms) {
t << "debug-" << item << ": $(ABLD)" << endl;
t << "\t$(ABLD)" << testClause << " build " << item << " udeb" << endl;
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index cad2736..bcb93af 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -150,8 +150,8 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
t << "first: default" << endl;
if (debugPlatforms.contains("winscw"))
t << "default: debug-winscw";
- else if (debugPlatforms.contains("armv5"))
- t << "default: debug-armv5";
+ else if (debugPlatforms.contains("armv6"))
+ t << "default: debug-armv6";
else if (debugPlatforms.size())
t << "default: debug-" << debugPlatforms.first();
else
@@ -182,7 +182,7 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo
}
t << endl;
- // For more specific builds, targets are in this form: build-platform, e.g. release-armv5
+ // For more specific builds, targets are in this form: build-platform, e.g. release-armv6
foreach(QString item, debugPlatforms) {
t << "debug-" << item << ": " << BLD_INF_FILENAME << endl;
t << "\t$(SBS) -c " << item << "_udeb" << testClause << endl;
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index f57f3a8..02375b3 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1164,7 +1164,7 @@ void Configure::parseCmdLine()
dictionary["QTBUILDINSTRUCTION"] = dictionary["MAKE"];
if (dictionary.contains("XQMAKESPEC")) {
if (dictionary["XQMAKESPEC"].startsWith("symbian")) {
- dictionary["QTBUILDINSTRUCTION"] = QString("make debug-winscw|debug-armv5|release-armv5");
+ dictionary["QTBUILDINSTRUCTION"] = QString("make debug-winscw|debug-armv6|release-armv6");
} else if (dictionary["XQMAKESPEC"].startsWith("wince")) {
dictionary["QTBUILDINSTRUCTION"] =
QString("setcepaths.bat ") + dictionary["XQMAKESPEC"] + QString(" && ") + dictionary["MAKE"];