summaryrefslogtreecommitdiffstats
path: root/src/javascriptinterface.cpp
diff options
context:
space:
mode:
authorNiklas Goby2011-03-23 14:46:19 +0100
committerNiklas Goby2011-03-23 14:46:19 +0100
commitbad06ebac5cca429e0cf6421fc0f2e92c1a2d555 (patch)
tree54aca49c444c1c171914ecf6506aaf108e19f674 /src/javascriptinterface.cpp
parentnew files (diff)
downloadfbgui-bad06ebac5cca429e0cf6421fc0f2e92c1a2d555.tar.gz
fbgui-bad06ebac5cca429e0cf6421fc0f2e92c1a2d555.tar.xz
fbgui-bad06ebac5cca429e0cf6421fc0f2e92c1a2d555.zip
working jquery over qrc
Diffstat (limited to 'src/javascriptinterface.cpp')
-rw-r--r--src/javascriptinterface.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/javascriptinterface.cpp b/src/javascriptinterface.cpp
index c3ac80c..ae976c6 100644
--- a/src/javascriptinterface.cpp
+++ b/src/javascriptinterface.cpp
@@ -69,8 +69,10 @@ void JavascriptInterface::quit(){
void JavascriptInterface::loadJQuery(){
QString js;
+ QString pathToJsDir(DEFAULT_QRC_HTML_DIR);
+ pathToJsDir.append("/js");
- QDir* qrcJSDir = new QDir(":/html/js/");
+ QDir* qrcJSDir = new QDir(pathToJsDir);
QFileInfoList fiList = qrcJSDir->entryInfoList();
QFileInfo fi;
foreach(fi, fiList)
@@ -79,10 +81,10 @@ void JavascriptInterface::loadJQuery(){
{
qDebug()<< fi.fileName();
qxtLog->debug() << fi.fileName();
- if(fi.fileName()=="test.js")
+ if(fi.fileName()!="test.js")
{
QFile file;
- file.setFileName(":/" + fi.fileName());
+ file.setFileName(pathToJsDir + "/" + fi.fileName());
file.open(QIODevice::ReadOnly);
js = file.readAll();
file.close();