Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 15:39:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,172 Commits 63 Branches 22 Tags 196 MiB
GSoC2017-evaluation-II
Commit Graph

21 Commits

Author SHA1 Message Date
Gioacchino Mazzurco
5a219b4d10 Update to Qt 5.8.0 
Simplified android buinding and updated documentation
Removed a bunch of unused qml files
 2017-03-15 23:11:50 +01:00
Gio
8ab3c7de26 Merge branch 'master' into android 2016-11-07 14:37:23 +01:00
Phenom
2db8dbd45f Fix El Capitan OSX 10.11 Compil 2016-11-02 21:40:46 +01:00
manu
50fe3dd711 QML activity interacts with backend. 
Test QML activity changed for a simplified version of drbob's rsqml-models.
It requests JSON documents from the libresapilocalserver and shows them raw.
Updated Android documentation.
Moved Android qmake section to the end of libretroshare.pro and openpgpsdk.pro
to avoid static linking errors.
 2016-09-04 15:01:44 +02:00
Phenom
79d761ae2e Add Win32 section in retroshare.pri 
And add MSys2 directories.
 2015-10-17 12:15:36 +02:00
AsamK
2be400e33e CONFIG shouldn't be reset at qmake call, use CONFIG+=… instead 
With CONFIG=…, the default values of CONFIG are cleared, with qt4 this
doesn't seem to be a problem, but with qt5 the build fails.

CONFIG=staticlib in openpgpsdk.pro was added in 3caeb0ab7f
for OS X, but is not necessary on linux
 2015-09-01 14:53:17 +02:00
AsamK
e135e3441c Create retroshare.pri for common configurations in .pro files 
So far it only contains the default values for installation paths
 2015-08-31 21:09:28 +02:00
csoler
2b8eafa1db removed default debug flag in .pro files. Fixed up version.h in packaging script. 2015-08-02 18:35:27 +02:00
thunder2
7f58460e5f Added DEPENDPATH to pro files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-12 23:14:35 +00:00
thunder2
d0238810b7 Common folders for libraries, includes and binaries of all external libraries for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-05 15:31:00 +00:00
thunder2
4c6ab35867 Updated external library to openssl-1.0.1h 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-06-05 23:51:48 +00:00
thunder2
9ea4ab24e0 Updated external library to openssl-1.0.1g for Windows compile (merged from v0.5.5) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7262 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-10 23:15:24 +00:00
thunder2
f818bb8e9a Fixed Windows compile with Qt 5 (Merged from branch v0.5.5) 
- Revert change of revision 7063 in openpgpsdk.pro for Windows compile
- Changed order of the libraries in FeedReader plugin

Fixed Windows compile with MinGW 4.8.0
- Added missing include

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7111 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-12 22:03:20 +00:00
drbob
3caeb0ab7f Dont know why this breaks OSX build - but it does... 
will investigate if the change affects others.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7063 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 08:59:19 +00:00
thunder2
13e7ac8b43 Fixed compile of the libraries with MinGW 4.8 on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-07 23:11:10 +00:00
thunder2
2de928dc64 Moved new files for ops_open from util to openpgpsdk. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 16:20:44 +00:00
thunder2
b85bccbbe6 Added function "ops_open" to openpgpsdk to open files with utf8 characters on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 15:58:44 +00:00
thunder2
70aabe11f0 Switched off optimized compile on Windows (again). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5376 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-02 23:25:28 +00:00
thunder2
515a0abdb3 Switched to OpenSSL-1.0.1c for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5329 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-26 16:59:42 +00:00
thunder2
e305ab547d Moved the include folder OpenSSL to the other external includes for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5319 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-21 23:21:39 +00:00
thunder2
b59f8e664a Renamed the pro-file of OpenPGP-SDK from "src.pro" to "openpgpsdk.pro". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5295 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-13 22:19:32 +00:00