22 commits

Author	SHA1	Message	Date
Markus Goetz	1bc8fd9b49	CMake: Don't need translations with token auth compile	2014-08-08 11:59:14 +02:00
Markus Goetz	be7b08b50a	CMake: Fix token auth compile	2014-06-16 15:34:46 +02:00
Markus Goetz	77ac092975	WiP: Attempt to compile without UI	2014-04-21 19:57:15 +02:00
Klaas Freitag	7d79d3d30d	Fix Search for Qt5 version Qt4	2014-04-08 12:08:01 +02:00
Daniel Molkentin	4ff39d8114	Cleanups, build if Qt5 is not on system	2014-04-07 18:08:28 +02:00
Daniel Molkentin	d416c97eac	Fix Qt5 detection	2014-04-07 17:38:30 +02:00
Daniel Molkentin	4bcd620c29	Avoid build attempts with Qt4 on Windows and Linux	2014-04-04 09:29:01 +02:00
Daniel Molkentin	7c7fad78f7	Qt5: QtLocation is not needed	2014-03-25 22:52:28 +01:00
Daniel Molkentin	1c8e5ef4ee	Fix typo	2014-03-25 20:05:06 +01:00
Daniel Molkentin	45ec489f71	Merge branch 'master' of github.com:shadone/mirall into shadone-master ... Conflicts: cmake/modules/QtVersionAbstraction.cmake src/CMakeLists.txt src/mirall/owncloudgui.cpp	2014-03-25 19:56:45 +01:00
Daniel Molkentin	dddec8b250	-fPIC is implied on Windows	2014-03-25 19:04:05 +01:00
Daniel Molkentin	06082b585a	Add translations when using Qt5 as well	2014-03-25 19:04:05 +01:00
Daniel Molkentin	955b932806	Qt5: QtLocation is not required	2014-03-12 18:23:45 +01:00
Daniel Molkentin	80e583c337	Error out if a Qt module is missing ... Fixes #1487	2014-03-12 18:18:02 +01:00
Denis Dzyubenko	a51cb0982b	Added Mac-specific settings dialog that looks more native	2014-02-18 02:22:16 +01:00
Olivier Goffart	a5379ef2aa	make BUILD_WITH_QT4 off by default ... Rationale: When Qt5 is not found, the script will automatically use Qt4. However, without this change, when Qt4 is not found, it will not try to find Qt5 because BUILD_WITH_QT4 is ON by default forbidding the use of Qt5 even if it is installed. Also, other packages default to Qt5 including qtkeychain See also issue #1418	2014-02-12 11:25:08 +01:00
Daniel Molkentin	5c4d240c66	Build on mac with Qt 5 ... I still had this patch on disk.	2013-11-19 14:41:40 +01:00
Daniel Molkentin	6b9950a9a0	Qt5: DBUS is only needed for FDO	2013-09-05 18:41:49 +02:00
Daniel Molkentin	35ac6610c7	Compile with Qt5 on Linux	2013-09-05 17:13:31 +02:00
Olivier Goffart	bf6d0a521c	Compile with Qt5	2013-08-28 20:58:22 +02:00
Olivier Goffart	336bbb2403	Compile with Qt4	2013-08-28 20:14:40 +02:00
Daniel Molkentin	73da086964	Initial changes to also build on Qt5, doesn't compile yet	2013-08-28 17:03:31 +02:00