summaryrefslogtreecommitdiffstats
path: root/src/fbbrowser.cpp
diff options
context:
space:
mode:
authorSebastian Schmelzer2011-02-22 17:16:45 +0100
committerSebastian Schmelzer2011-02-22 17:16:45 +0100
commitb845ad5ed8e21fda596b2787d7f764ded29fc222 (patch)
treee36ee84673ad3b69c99607e5dc83a27e9dce7980 /src/fbbrowser.cpp
parentmultiuser enabled (diff)
parentcommented out problem lines (diff)
downloadfbgui-b845ad5ed8e21fda596b2787d7f764ded29fc222.tar.gz
fbgui-b845ad5ed8e21fda596b2787d7f764ded29fc222.tar.xz
fbgui-b845ad5ed8e21fda596b2787d7f764ded29fc222.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/fbgui
Diffstat (limited to 'src/fbbrowser.cpp')
-rw-r--r--src/fbbrowser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index 6191466..94a8db7 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -130,13 +130,13 @@ void fbbrowser::getHardDrives_Slot()
void fbbrowser::showTime_Slot()
{
QString time = QTime::currentTime().toString("hh:mm:ss");
- view->page()->mainFrame->evaluateJavaScript(/*TODO:: edit jsFunction name*/ "");
+ //view->page()->mainFrame->evaluateJavaScript(/*TODO:: edit jsFunction name*/ "");
}
void fbbrowser::showDate_Slot()
{
QString date = QDate::currentDate().toString("dd.MM.yyyy");
- view->page()->mainFrame->evaluateJavaScript(/*TODO:: edit jsFunction name*/ "");
+ //view->page()->mainFrame->evaluateJavaScript(/*TODO:: edit jsFunction name*/ "");
}
void fbbrowser::getSysInfo()