Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #365 from zeners/master

Browse Source 
webui: fixed build things
This commit is contained in:
Cyril Soler 2016-05-03 13:11:41 -04:00
commit 0ff2941adf
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libresapi/src/libresapi.pro
View File

@ -22,11 +22,8 @@ unix {
webui_img_files.files = ../../retroshare-gui/src/gui/images/logo/logo_splash.png webui_img_files.files = ../../retroshare-gui/src/gui/images/logo/logo_splash.png
INSTALLS += webui_img_files INSTALLS += webui_img_files
#create_webfiles.commands = sh $$_PRO_FILE_PWD_/webui-src/make-src/build.sh $$_PRO_FILE_PWD_ # create dummy files, we need it to include files on first try
#QMAKE_EXTRA_TARGETS += create_webfiles system(webui-src/make-src/init.sh .)
#POST_TARGETDEPS += create_webfiles
#QMAKE_POST_LINK=sh $$_PRO_FILE_PWD_/webui-src/make-src/build.sh $$_PRO_FILE_PWD_
WEBUI_SRC_SCRIPT = webui-src/make-src/build.sh WEBUI_SRC_SCRIPT = webui-src/make-src/build.sh

8
libresapi/src/webui-src/app/assets/index.html
View File

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>rswebui5</title> <title>rswebui6</title>
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<script src="app.js"></script> <script src="app.js"></script>
</head> </head>
@ -14,9 +14,9 @@
var ui = require("main"); var ui = require("main");
var main = document.getElementById("main"); var main = document.getElementById("main");
ui.init(main); ui.init(main);
if (m.initControl != undefined) { if (m.initControl != undefined) {
m.initControl.focus(); m.initControl.focus();
} }
} }
</script> </script>
</body> </body>