summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/docs
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-08-21 10:57:44 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-08-21 10:57:44 +0200
commit5ef7c8a6a70875d4430752d146bdcb069605d71d (patch)
treef6256640b6c46d7da221435803cae65326817ba2 /Source/WebKit/qt/docs
parentdecad929f578d8db641febc8740649ca6c574638 (diff)
downloadqtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebKit/qt/docs')
-rw-r--r--Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp2
-rw-r--r--Source/WebKit/qt/docs/webkitsnippets/webpage/main.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp b/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
index b18456b0f..27018af33 100644
--- a/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
+++ b/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
@@ -58,7 +58,7 @@ void wrapInFunction()
class MyObject : QObject {
Q_OBJECT
- public slots:
+ public Q_SLOTS:
void doSomethingWithWebElement(const QWebElement&);
};
diff --git a/Source/WebKit/qt/docs/webkitsnippets/webpage/main.cpp b/Source/WebKit/qt/docs/webkitsnippets/webpage/main.cpp
index 491935a00..daeed2bc6 100644
--- a/Source/WebKit/qt/docs/webkitsnippets/webpage/main.cpp
+++ b/Source/WebKit/qt/docs/webkitsnippets/webpage/main.cpp
@@ -30,10 +30,10 @@ class Thumbnailer : public QObject
public:
Thumbnailer(const QUrl &url);
-signals:
+Q_SIGNALS:
void finished();
-private slots:
+private Q_SLOTS:
void render();
private: