diff options
| -rw-r--r-- | examples/declarative/loader/loader.pro | 2 | ||||
| -rw-r--r-- | examples/declarative/loader/qmlfolderlistmodel.h | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qml.h | 2 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 4 |
4 files changed, 3 insertions, 7 deletions
diff --git a/examples/declarative/loader/loader.pro b/examples/declarative/loader/loader.pro index 9ee0933..84b2d21 100644 --- a/examples/declarative/loader/loader.pro +++ b/examples/declarative/loader/loader.pro @@ -12,7 +12,7 @@ INSTALLS += target sources symbian { # TARGET.UID3 = include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCHEAPSIZE = 100000 20000000 + TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h LIBS += -lesock -lconnmon -linsock TARGET.CAPABILITY = NetworkServices diff --git a/examples/declarative/loader/qmlfolderlistmodel.h b/examples/declarative/loader/qmlfolderlistmodel.h index f4fa9ed..1cd881f 100644 --- a/examples/declarative/loader/qmlfolderlistmodel.h +++ b/examples/declarative/loader/qmlfolderlistmodel.h @@ -43,7 +43,7 @@ #define QMLFOLDERLISTMODEL_H #include <QtDeclarative/qml.h> -#include <QtDeclarative/QListModelInterface> +#include <QtDeclarative/private/qlistmodelinterface_p.h> class QmlContext; class QModelIndex; diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index 2c03aad..323525b 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE #define QML_DEFINE_INTERFACE(INTERFACE) \ static int defineInterface##INTERFACE = qmlRegisterInterface<INTERFACE>(#INTERFACE); -#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERS, NAME, TYPE, EXTENSION) \ +#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \ static int registerExtended##TYPE = qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE); #define QML_DEFINE_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE) \ diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 3fade73..2d9c489 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -109,10 +109,6 @@ symbian: { qtlibraries.sources += QtWebKit.dll } - contains(QT_CONFIG, declarative): { - qtlibraries.sources += QtDeclarative.dll - } - graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems contains(QT_CONFIG, openvg) { qtlibraries.sources += QtOpenVG.dll |