diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-09-15 05:22:25 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-09-15 05:22:25 (GMT) |
| commit | dc4a56df2809566b5d6a95126f9b834ea34be3fa (patch) | |
| tree | 8a236a890526a155e8cef647dfa19e81ad764aef | |
| parent | 2a880df9a7c82f904f7761d389c7cd00d3c088cb (diff) | |
| parent | 783d4911d61b986ca3c412662d1702dd18014be2 (diff) | |
| download | Qt-dc4a56df2809566b5d6a95126f9b834ea34be3fa.zip Qt-dc4a56df2809566b5d6a95126f9b834ea34be3fa.tar.gz Qt-dc4a56df2809566b5d6a95126f9b834ea34be3fa.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rwxr-xr-x | bin/createpackage.pl | 8 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarative.h | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 2569a66..361b32d 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -308,7 +308,7 @@ if($stub) { mkpath($systeminstall); my $stub_sis_name = $systeminstall."/".$stub_sis_name; # Create stub SIS. - system ("makesis -s $pkgoutput $stub_sis_name"); + system ("$ENV{EPOCROOT}epoc32/tools/makesis -s $pkgoutput $stub_sis_name"); } else { if ($certtext eq "Self Signed" && !@certificates @@ -321,7 +321,11 @@ if($stub) { # Create SIS. # The 'and' is because system uses 0 to indicate success. - system ("makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); + if($ENV{EPOCROOT}) { + system ("$ENV{EPOCROOT}epoc32/tools/makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); + } else { + system ("makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); + } print("\n"); my $targetInsert = ""; diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index c6b64ae..985ab72 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -269,7 +269,7 @@ int qmlRegisterInterface(const char *typeName) QByteArray pointerName(name + '*'); QByteArray listName("QDeclarativeListProperty<" + name + ">"); - QDeclarativePrivate::RegisterInterface interface = { + QDeclarativePrivate::RegisterInterface qmlInterface = { 0, qRegisterMetaType<T *>(pointerName.constData()), @@ -278,7 +278,7 @@ int qmlRegisterInterface(const char *typeName) qobject_interface_iid<T *>() }; - return QDeclarativePrivate::qmlregister(QDeclarativePrivate::InterfaceRegistration, &interface); + return QDeclarativePrivate::qmlregister(QDeclarativePrivate::InterfaceRegistration, &qmlInterface); } template<typename T> |