qcamera.h   qcamera.h 
skipping to change at line 215 skipping to change at line 215
Q_PRIVATE_SLOT(d_func(), void _q_updateState(QCamera::State)) Q_PRIVATE_SLOT(d_func(), void _q_updateState(QCamera::State))
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(QCamera::LockTypes) Q_DECLARE_OPERATORS_FOR_FLAGS(QCamera::LockTypes)
QT_END_NAMESPACE QT_END_NAMESPACE
Q_DECLARE_METATYPE(QCamera::State) Q_DECLARE_METATYPE(QCamera::State)
Q_DECLARE_METATYPE(QCamera::Status) Q_DECLARE_METATYPE(QCamera::Status)
Q_DECLARE_METATYPE(QCamera::Error) Q_DECLARE_METATYPE(QCamera::Error)
Q_DECLARE_METATYPE(QCamera::CaptureMode)
Q_DECLARE_METATYPE(QCamera::LockType) Q_DECLARE_METATYPE(QCamera::LockType)
Q_DECLARE_METATYPE(QCamera::LockStatus) Q_DECLARE_METATYPE(QCamera::LockStatus)
Q_DECLARE_METATYPE(QCamera::LockChangeReason) Q_DECLARE_METATYPE(QCamera::LockChangeReason)
#endif // QCAMERA_H #endif // QCAMERA_H
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 qcontactpresence.h   qcontactpresence.h 
skipping to change at line 95 skipping to change at line 95
void setTimestamp(const QDateTime& timestamp) {setValue(FieldTimestamp, timestamp);} void setTimestamp(const QDateTime& timestamp) {setValue(FieldTimestamp, timestamp);}
QDateTime timestamp() const {return value<QDateTime>(FieldTimestamp);} QDateTime timestamp() const {return value<QDateTime>(FieldTimestamp);}
void setNickname(const QString& nickname) {setValue(FieldNickname, nick name);} void setNickname(const QString& nickname) {setValue(FieldNickname, nick name);}
QString nickname() const {return value(FieldNickname);} QString nickname() const {return value(FieldNickname);}
void setPresenceState(PresenceState presence) {setValue(FieldPresenceSt ate, static_cast<int>(presence));} void setPresenceState(PresenceState presence) {setValue(FieldPresenceSt ate, static_cast<int>(presence));}
PresenceState presenceState() const {return static_cast<PresenceState>( value<int>(FieldPresenceState));} PresenceState presenceState() const {return static_cast<PresenceState>( value<int>(FieldPresenceState));}
void setPresenceStateText(const QString& presenceStateText) {setValue(F ieldPresenceStateText, presenceStateText);} void setPresenceStateText(const QString& presenceStateText) {setValue(F ieldPresenceStateText, presenceStateText);}
QString presenceStateText() const {return value(FieldPresenceStateText) ;} QString presenceStateText() const {return value(FieldPresenceStateText) ;}
void setPresenceStateImageUrl(const QUrl& presenceStateImageUrl) {setVa lue(FieldPresenceStateImageUrl, presenceStateImageUrl);} void setPresenceStateImageUrl(const QUrl& presenceStateImageUrl) {setVa lue(FieldPresenceStateImageUrl, presenceStateImageUrl);}
QUrl presenceStateImageUrl() const {return value(FieldPresenceStateImag eUrl);} QUrl presenceStateImageUrl() const {return value<QUrl>(FieldPresenceSta teImageUrl);}
void setCustomMessage(const QString& customMessage) {setValue(FieldCust omMessage, customMessage);} void setCustomMessage(const QString& customMessage) {setValue(FieldCust omMessage, customMessage);}
QString customMessage() const {return value(FieldCustomMessage);} QString customMessage() const {return value(FieldCustomMessage);}
}; };
QTM_END_NAMESPACE QTM_END_NAMESPACE
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qfeedbackeffect.h   qfeedbackeffect.h 
skipping to change at line 134 skipping to change at line 134
class Q_FEEDBACK_EXPORT QFeedbackHapticsEffect : public QFeedbackEffect class Q_FEEDBACK_EXPORT QFeedbackHapticsEffect : public QFeedbackEffect
{ {
Q_OBJECT Q_OBJECT
public: public:
Q_PROPERTY(int duration READ duration WRITE setDuration) Q_PROPERTY(int duration READ duration WRITE setDuration)
Q_PROPERTY(qreal intensity READ intensity WRITE setIntensity) Q_PROPERTY(qreal intensity READ intensity WRITE setIntensity)
Q_PROPERTY(int attackTime READ attackTime WRITE setAttackTime) Q_PROPERTY(int attackTime READ attackTime WRITE setAttackTime)
Q_PROPERTY(qreal attackIntensity READ attackIntensity WRITE setAttackIn tensity) Q_PROPERTY(qreal attackIntensity READ attackIntensity WRITE setAttackIn tensity)
Q_PROPERTY(int fadeTime READ fadeTime WRITE setFadeTime) Q_PROPERTY(int fadeTime READ fadeTime WRITE setFadeTime)
Q_PROPERTY(int fadeIntensity READ fadeIntensity WRITE setFadeIntensity) Q_PROPERTY(qreal fadeIntensity READ fadeIntensity WRITE setFadeIntensit y)
Q_PROPERTY(int period READ period WRITE setPeriod) Q_PROPERTY(int period READ period WRITE setPeriod)
Q_PROPERTY(QFeedbackActuator* actuator READ actuator WRITE setActuator) Q_PROPERTY(QFeedbackActuator* actuator READ actuator WRITE setActuator)
explicit QFeedbackHapticsEffect(QObject *parent = 0); explicit QFeedbackHapticsEffect(QObject *parent = 0);
~QFeedbackHapticsEffect(); ~QFeedbackHapticsEffect();
void setDuration(int msecs); void setDuration(int msecs);
int duration() const; int duration() const;
void setIntensity(qreal intensity); void setIntensity(qreal intensity);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qgeoroute.h   qgeoroute.h 
skipping to change at line 85 skipping to change at line 85
void setRequest(const QGeoRouteRequest &request); void setRequest(const QGeoRouteRequest &request);
QGeoRouteRequest request() const; QGeoRouteRequest request() const;
void setBounds(const QGeoBoundingBox &bounds); void setBounds(const QGeoBoundingBox &bounds);
QGeoBoundingBox bounds() const; QGeoBoundingBox bounds() const;
void setFirstRouteSegment(const QGeoRouteSegment &routeSegment); void setFirstRouteSegment(const QGeoRouteSegment &routeSegment);
QGeoRouteSegment firstRouteSegment() const; QGeoRouteSegment firstRouteSegment() const;
// void setRouteSegments(const QList<QGeoRouteSegment> &routeSegments);
// QList<QGeoRouteSegment> routeSegments() const;
void setTravelTime(int secs); void setTravelTime(int secs);
int travelTime() const; int travelTime() const;
void setDistance(qreal distance); void setDistance(qreal distance);
qreal distance() const; qreal distance() const;
void setTravelMode(QGeoRouteRequest::TravelMode mode); void setTravelMode(QGeoRouteRequest::TravelMode mode);
QGeoRouteRequest::TravelMode travelMode() const; QGeoRouteRequest::TravelMode travelMode() const;
void setPath(const QList<QGeoCoordinate> &path); void setPath(const QList<QGeoCoordinate> &path);
 End of changes. 1 change blocks. 
3 lines changed or deleted 0 lines changed or added


 qgeotiledmapdata.h   qgeotiledmapdata.h 
skipping to change at line 101 skipping to change at line 101
protected: protected:
void paintMap(QPainter *painter, const QStyleOptionGraphicsItem *option ); void paintMap(QPainter *painter, const QStyleOptionGraphicsItem *option );
void paintObjects(QPainter *painter, const QStyleOptionGraphicsItem *op tion); void paintObjects(QPainter *painter, const QStyleOptionGraphicsItem *op tion);
QGeoMapObjectInfo* createMapObjectInfo(QGeoMapObject *mapObject); QGeoMapObjectInfo* createMapObjectInfo(QGeoMapObject *mapObject);
private Q_SLOTS: private Q_SLOTS:
void processRequests(); void processRequests();
void tileFinished(); void tileFinished();
void replyFinished(QGeoTiledMapReply *reply);
void tileError(QGeoTiledMapReply::Error error, QString errorString); void tileError(QGeoTiledMapReply::Error error, QString errorString);
private: private:
Q_DECLARE_PRIVATE(QGeoTiledMapData) Q_DECLARE_PRIVATE(QGeoTiledMapData)
Q_DISABLE_COPY(QGeoTiledMapData) Q_DISABLE_COPY(QGeoTiledMapData)
friend class QGeoTiledMappingManagerEngine; friend class QGeoTiledMappingManagerEngine;
friend class QGeoTiledMapObjectInfo; friend class QGeoTiledMapObjectInfo;
}; };
QTM_END_NAMESPACE QTM_END_NAMESPACE
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 qlandmark.h   qlandmark.h 
skipping to change at line 109 skipping to change at line 109
void setLandmarkId(const QLandmarkId &id); void setLandmarkId(const QLandmarkId &id);
void clear(); void clear();
private: private:
QLandmarkPrivate* d_func(); QLandmarkPrivate* d_func();
const QLandmarkPrivate* d_func() const; const QLandmarkPrivate* d_func() const;
}; };
QTM_END_NAMESPACE QTM_END_NAMESPACE
Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmark)); Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmark))
Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmark), Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmark), Q_MOVABLE_TYPE);
QT_END_HEADER QT_END_HEADER
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qlandmarkcategory.h   qlandmarkcategory.h 
skipping to change at line 86 skipping to change at line 86
QLandmarkCategoryId categoryId() const; QLandmarkCategoryId categoryId() const;
void setCategoryId(const QLandmarkCategoryId &id); void setCategoryId(const QLandmarkCategoryId &id);
void clear(); void clear();
private: private:
QSharedDataPointer<QLandmarkCategoryPrivate> d; QSharedDataPointer<QLandmarkCategoryPrivate> d;
}; };
QTM_END_NAMESPACE QTM_END_NAMESPACE
Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkCategory)); Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkCategory))
Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkCategory), Q_MOVABLE_TYPE ); Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkCategory), Q_MOVABLE_TYPE );
QT_END_HEADER QT_END_HEADER
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qlandmarkcategoryid.h   qlandmarkcategoryid.h 
skipping to change at line 80 skipping to change at line 80
bool operator!=(const QLandmarkCategoryId &other) const; bool operator!=(const QLandmarkCategoryId &other) const;
private: private:
QSharedDataPointer<QLandmarkCategoryIdPrivate> d; QSharedDataPointer<QLandmarkCategoryIdPrivate> d;
}; };
QTM_END_NAMESPACE QTM_END_NAMESPACE
QT_END_HEADER QT_END_HEADER
Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkCategoryId)); Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkCategoryId))
Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkCategoryId), Q_MOVABLE_TY PE); Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkCategoryId), Q_MOVABLE_TY PE);
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qlandmarkid.h   qlandmarkid.h 
skipping to change at line 79 skipping to change at line 79
bool operator==(const QLandmarkId &other) const; bool operator==(const QLandmarkId &other) const;
bool operator!=(const QLandmarkId &other) const; bool operator!=(const QLandmarkId &other) const;
private: private:
QSharedDataPointer<QLandmarkIdPrivate> d; QSharedDataPointer<QLandmarkIdPrivate> d;
}; };
QTM_END_NAMESPACE QTM_END_NAMESPACE
QT_END_HEADER QT_END_HEADER
Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkId)); Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkId))
Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkId), Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkId), Q_MOVABLE_TYPE);
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qmobilityglobal.h   qmobilityglobal.h 
skipping to change at line 44 skipping to change at line 44
** met: http://www.gnu.org/copyleft/gpl.html. ** met: http://www.gnu.org/copyleft/gpl.html.
** **
** If you are unsure which license is appropriate for your use, please ** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com. ** contact the sales department at qt-sales@nokia.com.
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
*************************************************************************** */ *************************************************************************** */
#ifndef QMOBILITYGLOBAL_H #ifndef QMOBILITYGLOBAL_H
#define QMOBILITYGLOBAL_H #define QMOBILITYGLOBAL_H
#define QTM_VERSION_STR "1.1.0" #define QTM_VERSION_STR "1.1.1"
/* /*
QTM_VERSION is (major << 16) + (minor << 8) + patch. QTM_VERSION is (major << 16) + (minor << 8) + patch.
*/ */
#define QTM_VERSION 0x010100 #define QTM_VERSION 0x010101
/* /*
can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 1, 0)) can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 1, 1))
*/ */
#define QTM_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(pat ch)) #define QTM_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(pat ch))
#define QTM_PACKAGEDATE_STR "2010-11-01" #define QTM_PACKAGEDATE_STR "2011-02-28"
#define QTM_PACKAGE_TAG "fbbf8dad1046695fa14713f08ecdd19b81c67ea6" #define QTM_PACKAGE_TAG "84ae67b72382124f8f1a62c6e160fe14cdcd3167"
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMB IAN)) && defined(QT_MAKEDLL) #if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMB IAN)) && defined(QT_MAKEDLL)
# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT # define QM_AUTOTEST_EXPORT Q_DECL_EXPORT
#elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SY MBIAN)) && defined(QT_DLL) #elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SY MBIAN)) && defined(QT_DLL)
# define QM_AUTOTEST_EXPORT Q_DECL_IMPORT # define QM_AUTOTEST_EXPORT Q_DECL_IMPORT
#elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) || defined(Q_OS_S YMBIAN)) && defined(QT_SHARED) #elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) || defined(Q_OS_S YMBIAN)) && defined(QT_SHARED)
# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT # define QM_AUTOTEST_EXPORT Q_DECL_EXPORT
#else #else
# define QM_AUTOTEST_EXPORT # define QM_AUTOTEST_EXPORT
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added


 qorganizerabstractrequest.h   qorganizerabstractrequest.h 
/************************************************************************** ** /************************************************************************** **
** **
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved. ** All rights reserved.
** Item: Nokia Corporation (qt-info@nokia.com) ** Contact: Nokia Corporation (qt-info@nokia.com)
** **
** This file is part of the Qt Mobility Components. ** This file is part of the Qt Mobility Components.
** **
** $QT_BEGIN_LICENSE:LGPL$ ** $QT_BEGIN_LICENSE:LGPL$
** Commercial Usage ** Commercial Usage
** Licensees holding valid Qt Commercial licenses may use this file in ** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with ** accordance with the Qt Commercial License Agreement provided with
** the Software or, alternatively, in accordance with the terms ** the Software or, alternatively, in accordance with the terms
** contained in a written agreement between you and Nokia. ** contained in a written agreement between you and Nokia.
** **
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qorganizeritemfilter.h   qorganizeritemfilter.h 
/************************************************************************** ** /************************************************************************** **
** **
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved. ** All rights reserved.
** OrganizerItem: Nokia Corporation (qt-info@nokia.com) ** Contact: Nokia Corporation (qt-info@nokia.com)
** **
** This file is part of the Qt Mobility Components. ** This file is part of the Qt Mobility Components.
** **
** $QT_BEGIN_LICENSE:LGPL$ ** $QT_BEGIN_LICENSE:LGPL$
** Commercial Usage ** Commercial Usage
** Licensees holding valid Qt Commercial licenses may use this file in ** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with ** accordance with the Qt Commercial License Agreement provided with
** the Software or, alternatively, in accordance with the terms ** the Software or, alternatively, in accordance with the terms
** contained in a written agreement between you and Nokia. ** contained in a written agreement between you and Nokia.
** **
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qorganizerjournal.h   qorganizerjournal.h 
skipping to change at line 56 skipping to change at line 56
QTM_BEGIN_NAMESPACE QTM_BEGIN_NAMESPACE
class Q_ORGANIZER_EXPORT QOrganizerJournal : public QOrganizerItem class Q_ORGANIZER_EXPORT QOrganizerJournal : public QOrganizerItem
{ {
public: public:
#if !Q_QDOC #if !Q_QDOC
Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerJournal, QOrganizerItemType:: TypeJournal) Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerJournal, QOrganizerItemType:: TypeJournal)
#endif #endif
// XXX TODO: research whether journal is a single point in time, or can cover a period of time...
void setDateTime(const QDateTime& dateTime); void setDateTime(const QDateTime& dateTime);
QDateTime dateTime() const; QDateTime dateTime() const;
}; };
QTM_END_NAMESPACE QTM_END_NAMESPACE
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 qservicemanager.h   qservicemanager.h 
skipping to change at line 120 skipping to change at line 120
//TODO this should really be //TODO this should really be
//instance = qobject_cast<T *>(loadInterface(descriptor, contex t, session)); //instance = qobject_cast<T *>(loadInterface(descriptor, contex t, session));
//check why qobject_cast fails //check why qobject_cast fails
const char* templateClassName = reinterpret_cast<T *>(0)->stati cMetaObject.className(); const char* templateClassName = reinterpret_cast<T *>(0)->stati cMetaObject.className();
const QMetaObject* source = obj->metaObject(); const QMetaObject* source = obj->metaObject();
do { do {
if (strcmp(templateClassName,source->className())==0) { if (strcmp(templateClassName,source->className())==0) {
instance = static_cast<T *>(obj); instance = static_cast<T *>(obj);
break; break;
} }
source = source->superClass();
} while ((source = source->superClass())); } while (source != 0);
if (!instance) if (!instance)
delete obj; delete obj;
} }
return instance; return instance;
} }
bool addService(const QString& xmlFilePath); bool addService(const QString& xmlFilePath);
bool addService(QIODevice* xmlDevice); bool addService(QIODevice* xmlDevice);
bool removeService(const QString& serviceName); bool removeService(const QString& serviceName);
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 qversitcontacthandler.h   qversitcontacthandler.h 
skipping to change at line 68 skipping to change at line 68
virtual QString name() const = 0; virtual QString name() const = 0;
virtual int index() const { return 0; } virtual int index() const { return 0; }
virtual QVersitContactHandler* createHandler() const = 0; virtual QVersitContactHandler* createHandler() const = 0;
#ifdef Q_QDOC #ifdef Q_QDOC
static const QLatin1Constant ProfileSync; static const QLatin1Constant ProfileSync;
static const QLatin1Constant ProfileBackup; static const QLatin1Constant ProfileBackup;
#else #else
Q_DECLARE_LATIN1_CONSTANT(ProfileSync, "Sync"); Q_DECLARE_LATIN1_CONSTANT(ProfileSync, "Sync");
Q_DECLARE_LATIN1_CONSTANT(ProfileBackup, "Backup"); Q_DECLARE_LATIN1_CONSTANT(ProfileBackup, "Backup");
// This is not enabled for 1.1.x because it's binary incompatible with
1.1.0
// TODO: enable this for 1.2
//Q_DECLARE_LATIN1_CONSTANT(ProfilePreserve, "Preserve");
#endif #endif
}; };
class Q_VERSIT_EXPORT QVersitContactHandler : public QVersitContactImporter PropertyHandlerV2, class Q_VERSIT_EXPORT QVersitContactHandler : public QVersitContactImporter PropertyHandlerV2,
public QVersitContactExporter DetailHandlerV2 public QVersitContactExporter DetailHandlerV2
{ {
public: public:
virtual ~QVersitContactHandler() {} virtual ~QVersitContactHandler() {}
}; };
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/