diff options
| author | Niklas Goby | 2011-03-10 12:43:29 +0100 |
|---|---|---|
| committer | Niklas Goby | 2011-03-10 12:43:29 +0100 |
| commit | bf9ca3c302e7302f172fee1c9869b342d1c98576 (patch) | |
| tree | 368896b5ad120b8bcd7acc5131a6f3624f96ebcd | |
| parent | Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui (diff) | |
| download | fbgui-bf9ca3c302e7302f172fee1c9869b342d1c98576.tar.gz fbgui-bf9ca3c302e7302f172fee1c9869b342d1c98576.tar.xz fbgui-bf9ca3c302e7302f172fee1c9869b342d1c98576.zip | |
small changes in the test method getAllInfo() in sysinfo class
| -rw-r--r-- | src/fbgui.conf | 2 | ||||
| -rw-r--r-- | src/sysInfo.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/fbgui.conf b/src/fbgui.conf index 1718021..99d7d0e 100644 --- a/src/fbgui.conf +++ b/src/fbgui.conf @@ -1,3 +1,3 @@ [default] -url=http://132.230.4.3/mockup/index.html +url=http://132.230.4.3/mockup/openslx.php downloadDirectory=/downloads diff --git a/src/sysInfo.cpp b/src/sysInfo.cpp index a3151b9..b4c1dd0 100644 --- a/src/sysInfo.cpp +++ b/src/sysInfo.cpp @@ -51,6 +51,7 @@ QString sysInfo::getIPAddress(){ } // ------------------------------------------------------------------------------------------------ QString sysInfo::getAllInfos(){ + QString tmp = "[{\"mac\":\"" + getMACAddress() +"\", \"ip\":\"" + getIPAddress() +"\"]}]"; - return "test"; + return tmp; } |