diff options
| author | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-10-27 17:10:49 +0300 |
|---|---|---|
| committer | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-10-27 17:10:49 +0300 |
| commit | 1d9a2b32e181dc3962909e715992bf48f033525a (patch) | |
| tree | 625bfaa665efbe7982c57b1facd9d89665eecbd7 | |
| parent | 28c22cf2a21387fb1fb4768533f97b957e0ec1fb (diff) | |
| parent | 73fd8fbacad4d909b64fa8507959b278542316f3 (diff) | |
Merge branch 'master' into meego
| -rw-r--r-- | libdbus-qeventloop/dbusconnectioneventloop.h | 2 | ||||
| -rw-r--r-- | resourceqt-client/client.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libdbus-qeventloop/dbusconnectioneventloop.h b/libdbus-qeventloop/dbusconnectioneventloop.h index 626bffb..c95c314 100644 --- a/libdbus-qeventloop/dbusconnectioneventloop.h +++ b/libdbus-qeventloop/dbusconnectioneventloop.h @@ -124,7 +124,7 @@ private: */ Connections connections; -private slots: +private Q_SLOTS: void readSocket(int fd); void writeSocket(int fd); void dispatch(); diff --git a/resourceqt-client/client.cpp b/resourceqt-client/client.cpp index 1b92d67..25ae5a1 100644 --- a/resourceqt-client/client.cpp +++ b/resourceqt-client/client.cpp @@ -155,7 +155,7 @@ const char * resourceTypeToString(ResourceType type) case VideoPlaybackType: return "VideoPlayback"; case VideoRecorderType: - return "VideoRegording"; + return "VideoRecording"; case VibraType: return "Vibra"; case LedsType: |