Daniel Molkentin
cdac8d56d5
Merge remote-tracking branch 'origin/master' into crashreporter
...
Conflicts:
src/libsync/utility.cpp
src/libsync/utility.h
2014-11-11 23:53:38 +01:00
Christian Kamm
7ae0338f5c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/socketapi.h
src/libsync/syncengine.h
test/CMakeLists.txt
2014-10-22 10:41:55 +02:00
Markus Goetz
1d5b3aadea
sqlite3: Bundle 3.8.6 for Mac and Windows
...
it is linked into ocsync.
2014-10-16 17:38:45 +02:00
Tim Vandecasteele
f3cc614427
Fix apple build.
...
The apple build was broken because the elseif in the CMakeLists is never triggered.
Some code was not properly adapted for the new qtmacgoodies.
Some paths were not adapted to new split.
2014-09-12 14:24:26 +02:00
Dominik Schmidt
2b4849a2fa
Add crash reporter using libcrashreporter-qt
2014-08-26 18:15:13 +02:00
Markus Goetz
faa502163e
OS X: Finally(?) fix stay-on-top behaviour of settings dialog
...
Fixes #1795
2014-08-12 14:48:42 +02:00
Olivier Goffart
bcfa34357b
Add Q_DECL_OVERRIDE for all function that are overriding something
...
This was made automatically with
clang-modernize -override-macros -add-override
2014-07-09 23:31:56 +02:00
Daniel Molkentin
485a6926c5
FancyLineEdit: initialize all members
...
This fixes Coverity CID 12912
2014-06-20 13:46:57 +02:00
Daniel Molkentin
3db3c7b876
Update QtSingleApplication and QtLockedFile
...
Fixes stale temp file issues, and is needed for blocking support.
2014-05-21 11:19:38 +02:00
Denis Dzyubenko
000e0bb600
Fast forwarded qtmacgoodies
2014-03-27 10:39:56 +01:00
Denis Dzyubenko
6c28151e0f
Fast forwarded qtmacgoodies submodule
2014-03-26 10:15:35 +01:00
Denis Dzyubenko
a51cb0982b
Added Mac-specific settings dialog that looks more native
2014-02-18 02:22:16 +01:00
Olivier Goffart
c7227297af
Make it compile with the merge of csync mirall
2014-01-15 12:20:03 +01:00
Daniel Molkentin
a25d55a265
Add QtJson to 3rdparty, use it in ownCloudInfo
2013-10-18 02:00:19 +02:00
Klaas Freitag
59bf8740a0
Add c_jhash.h header from csync to 3rdparty.
2013-10-03 16:41:23 +02:00
Klaas Freitag
82cd79c004
Add unify defines to header.
2013-10-01 13:58:00 +02:00
Olivier Goffart
bf6d0a521c
Compile with Qt5
2013-08-28 20:58:22 +02:00
Daniel Molkentin
54e4217216
Add Missing LGPL_EXCEPTION.txt
...
Fixes #671
2013-06-10 07:38:35 +02:00
Klaas Freitag
3f3f6c0f39
Move setPlaceholderText to correct class.
2013-04-29 14:09:05 +02:00
Klaas Freitag
5dd53b48ef
Add missing lineedit method for ancient Qt versions
2013-04-29 11:08:37 +02:00
Daniel Molkentin
311bd39100
Add simplified FancyLineEdit from Qt Creator to 3rdparty
2013-04-24 13:36:25 +02:00
Klaas Freitag
09e7f5c618
Add qprogressindicator widget
2013-04-24 11:45:53 +02:00
Klaas Freitag
5275238f51
Added 3rdpart QtSingleApplication class. Fixed some overall-status
...
issues.
2012-07-30 17:10:48 +03:00
