diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 18:14:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 18:14:08 (GMT) |
| commit | fc007d0a99cc52e673c5d2606e5076831f6103b1 (patch) | |
| tree | 5ad98ad0fa614b9becf21f2419adb633666028c9 /src/declarative | |
| parent | f4ee70e849759adc710a56cf25e08a32b8250ebd (diff) | |
| parent | acc84a9d0d3427155298db3a8c0ad406d078de0e (diff) | |
| download | Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.zip Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.tar.gz Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Check S60_VERSION instead of existence of certain files in bearer plugin
Fixed EPOCROOT references in createpackage.pl.
Restore 4.7.0 behavior that non-existing paths are possible.
QTBUG-4852 Turning on runtime nested exception support where available
Fix warnings
Fixed incorrect Symbian scoping.
QS60style: itemview selection indication works incorrectly
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativecustomparser_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativepixmapcache_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index 509e30a..c3f9dd2 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p.h @@ -117,7 +117,7 @@ public: NoFlag = 0x00000000, AcceptsAttachedProperties = 0x00000001 }; - Q_DECLARE_FLAGS(Flags, Flag); + Q_DECLARE_FLAGS(Flags, Flag) QDeclarativeCustomParser() : compiler(0), object(0), m_flags(NoFlag) {} QDeclarativeCustomParser(Flags f) : compiler(0), object(0), m_flags(f) {} diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/declarative/util/qdeclarativepixmapcache_p.h index b4d88bd..2e83cc4 100644 --- a/src/declarative/util/qdeclarativepixmapcache_p.h +++ b/src/declarative/util/qdeclarativepixmapcache_p.h @@ -98,7 +98,7 @@ public: bool connectDownloadProgress(QObject *, int); private: - Q_DISABLE_COPY(QDeclarativePixmap); + Q_DISABLE_COPY(QDeclarativePixmap) QDeclarativePixmapData *d; }; |