diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-15 06:17:12 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-15 06:17:12 (GMT) |
| commit | ad9221b06dd35315e9fa07d4ec88a57b42b97b39 (patch) | |
| tree | 0789529149a321e8d4770ea53ffc96000cc4afc1 | |
| parent | 8fc45851858d748732b340705c26413ee7754291 (diff) | |
| parent | 149750b60b99da47ccb22f22273c19bb4c2613ce (diff) | |
| download | Qt-ad9221b06dd35315e9fa07d4ec88a57b42b97b39.zip Qt-ad9221b06dd35315e9fa07d4ec88a57b42b97b39.tar.gz Qt-ad9221b06dd35315e9fa07d4ec88a57b42b97b39.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | src/declarative/debugger/qmldebugclient.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxlistview.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxtextinput_p.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp index d13de57..3171808 100644 --- a/src/declarative/debugger/qmldebugclient.cpp +++ b/src/declarative/debugger/qmldebugclient.cpp @@ -104,7 +104,7 @@ bool QmlDebugConnection::isConnected() const class QmlDebugClientPrivate : public QObjectPrivate { - Q_DECLARE_PUBLIC(QmlDebugClient); + Q_DECLARE_PUBLIC(QmlDebugClient) public: QmlDebugClientPrivate(); diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp index 604d16b..4fb0ec1 100644 --- a/src/declarative/fx/qfxlistview.cpp +++ b/src/declarative/fx/qfxlistview.cpp @@ -166,7 +166,7 @@ public: class QFxListViewPrivate : public QFxFlickablePrivate { - Q_DECLARE_PUBLIC(QFxListView); + Q_DECLARE_PUBLIC(QFxListView) public: QFxListViewPrivate() diff --git a/src/declarative/fx/qfxtextinput_p.h b/src/declarative/fx/qfxtextinput_p.h index a2b45bb..3978be4 100644 --- a/src/declarative/fx/qfxtextinput_p.h +++ b/src/declarative/fx/qfxtextinput_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE class QFxTextInputPrivate : public QFxPaintedItemPrivate { - Q_DECLARE_PUBLIC(QFxTextInput); + Q_DECLARE_PUBLIC(QFxTextInput) public: QFxTextInputPrivate() : control(new QLineControl(QString())), color((QRgb)0), style(QFxText::Normal), |