diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 11:58:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 11:58:56 (GMT) |
| commit | d9dd68c4400c3ca590ea425d6f3d070ea6094099 (patch) | |
| tree | cdfbec67e182670673ac957f11708ddbaf2fc26b /tools | |
| parent | 978daedf73ba7aecf9ea9f83c9108308e4303d6e (diff) | |
| parent | 19ebb3f5b2f599018594e9f0dd3b9de81f584262 (diff) | |
| download | Qt-d9dd68c4400c3ca590ea425d6f3d070ea6094099.zip Qt-d9dd68c4400c3ca590ea425d6f3d070ea6094099.tar.gz Qt-d9dd68c4400c3ca590ea425d6f3d070ea6094099.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:
Remove enums from bitfield, since all compilers do not support them.
Fixed compile error in runonphone.
Use QImage 'convertInPlace' versions in QVGPixmapData load functions.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/runonphone/ossignalconverter.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/runonphone/ossignalconverter.h b/tools/runonphone/ossignalconverter.h index f53f3c1..398d0f6 100644 --- a/tools/runonphone/ossignalconverter.h +++ b/tools/runonphone/ossignalconverter.h @@ -43,6 +43,8 @@ #define OSSIGNALCONVERTER_H #include <QObject> +class OsSignalConverterPrivate; + class OsSignalConverter : public QObject { friend class OsSignalConverterPrivate; |