summaryrefslogtreecommitdiffstats
path: root/src/javascriptinterface.h
diff options
context:
space:
mode:
authorJonathan Bauer2011-03-23 13:02:50 +0100
committerJonathan Bauer2011-03-23 13:02:50 +0100
commit739dd7bd3b6bb40aa2058f28e76a4b1ccc9ae86b (patch)
tree23fffa3d3a16c1a759f85fe43af484bfede07607 /src/javascriptinterface.h
parent... (diff)
parentcan read the serial out of /tmp/serial if this exists (diff)
downloadfbgui-739dd7bd3b6bb40aa2058f28e76a4b1ccc9ae86b.tar.gz
fbgui-739dd7bd3b6bb40aa2058f28e76a4b1ccc9ae86b.tar.xz
fbgui-739dd7bd3b6bb40aa2058f28e76a4b1ccc9ae86b.zip
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Diffstat (limited to 'src/javascriptinterface.h')
-rw-r--r--src/javascriptinterface.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/javascriptinterface.h b/src/javascriptinterface.h
index fe42a94..d51dccb 100644
--- a/src/javascriptinterface.h
+++ b/src/javascriptinterface.h
@@ -27,6 +27,8 @@ private:
QWebFrame* _parent;
QString _callBackOnDownloadsFinished;
+ void loadJQuery();
+
public:
JavascriptInterface(QWebFrame* parent);
~JavascriptInterface();