Jürgen Weigert
c3d41f0d48
Fixed https://github.com/owncloud/mirall/issues/1699
...
Missing copyright headers added.
2014-09-18 12:26:55 +02:00
Klaas Freitag
bcff1ced5e
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folderman.cpp
src/gui/wizard/owncloudadvancedsetuppage.cpp
src/libsync/account.cpp
2014-08-29 20:40:33 +02:00
Daniel Molkentin
cc5f5cf3a6
Set the minimum supported OS X version to 10.7
...
We dropped 10.6 support quite a while ago.
This should avoid bug reports from 10.6 users.
Fixes #2122
2014-08-28 14:50:00 +02:00
Daniel Molkentin
902bb7a198
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
Daniel Molkentin
c60b433c42
create shellext path
2014-08-21 20:33:25 +02:00
Daniel Molkentin
933c7e36d1
NSIS: fix target path for shell extension
2014-08-21 17:33:22 +02:00
Daniel Molkentin
ccf532672b
Use InstallLib to install the overlay icons
...
This allows for a cleaner expirience
2014-08-20 16:07:22 +02:00
Daniel Molkentin
4fc044d368
Merge branch 'master' into move_lib_to_sep_dir
...
Conflicts:
cmake/modules/NSIS.template.in
src/CMakeLists.txt
src/creds/shibboleth/authenticationdialog.cpp
src/creds/shibboleth/authenticationdialog.h
src/gui/owncloudgui.cpp
src/libsync/creds/shibboleth/authenticationdialog.cpp
src/libsync/creds/shibboleth/authenticationdialog.h
src/libsync/mirallaccessmanager.cpp
src/mirall/authenticationdialog.cpp
src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02:00
Daniel Molkentin
57ef515def
Use std=c++0x instead of c++11
...
Required for compat with Ubuntu 12.04, and possibly RHEL.
2014-08-11 15:46:45 +02:00
Daniel Molkentin
fa8f6f91c4
NSIS: Add a packaging routine for the overlay icons
2014-08-07 15:54:39 +02:00
Daniel Molkentin
f06019ab81
NSIS: First steps at installing the shell extension
2014-08-06 10:44:17 +02:00
Daniel Molkentin
8b1aebcdba
No need to ship the Qt4-based qtkeychain DLL
2014-08-05 13:11:15 +02:00
Olivier Goffart
8a88ca6f34
Merge branch 'il'
...
Conflicts:
src/mirall/propagator_legacy.h
2014-07-18 17:00:38 +02:00
Olivier Goffart
81d786733d
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
src/mirall/propagator_qnam.cpp
src/mirall/propagator_qnam.h
2014-07-18 16:59:29 +02:00
Daniel Molkentin
7ff62bc577
NSIS: ICU rebumped to 5.3 as per build service change
2014-07-17 14:57:04 +02:00
Klaas Freitag
d8ebebaf12
WinInstaller: No hardcoded www in front of the url on final page.
2014-07-16 18:39:51 +02:00
Daniel Molkentin
ea690c285b
Make NSIS installer work with new structure
2014-07-14 13:12:31 +02:00
Olivier Goffart
846773efd3
Define Q_DECL_OVERRIDE for Qt4
...
That macro is new in Qt5, define it as well when compiling with Qt4
so we can use it in mirall
Note: QNetworkCookieJar::deleteCookie was not existing in Qt4.
2014-07-09 23:31:56 +02:00
Daniel Molkentin
2961c44bbe
NSIS: look for socketapiclient in the right place
2014-07-03 09:35:45 +02:00
Daniel Molkentin
997559dc6d
NSIS: fix typo
2014-07-03 09:17:08 +02:00
Daniel Molkentin
6bc425f981
NSIS: Add socketapiclient
2014-07-02 12:05:23 +02:00
Olivier Goffart
92f07cb60f
Enable C++11
...
In order to avoid the warning
warning: anonymous variadic macros were introduced in C99
Due to the use of variadic macro in the qDebug macro in Qt 5.3
C++11 requires a space between string literal and macro to avoid the
ambiguity with user defined litteral
2014-06-25 12:01:27 +02:00
Olivier Goffart
3c4f410a4e
cmake compilation flags: don't define -Wdeclaration-after-statement
...
We are in 2014, let me use C99 already.
2014-06-24 11:02:58 +02:00
Olivier Goffart
02704cdf74
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
csync/src/csync_statedb.c
src/mirall/syncengine.cpp
src/mirall/syncfileitem.h
2014-06-23 12:48:34 +02:00
Daniel Molkentin
c855b783d9
NSIS: Remove duplicated entry
2014-06-20 15:53:10 +02:00
Daniel Molkentin
f593fc8e4d
NSIS: Bump required libpng version to 16
2014-06-20 15:50:42 +02:00
Daniel Molkentin
9ca82ba14d
NSIS: add libwinpthread dependency
2014-06-20 14:58:05 +02:00
Markus Goetz
be7b08b50a
CMake: Fix token auth compile
2014-06-16 15:34:46 +02:00
Daniel Molkentin
b814b45e50
Add version and product information to installer properties
2014-06-05 11:51:12 +02:00
Olivier Goffart
9f0848ba15
Merge remote-tracking branch 'origin/libowncloudsync_noqtgui'
2014-04-29 12:23:15 +02:00
Klaas Freitag
1af7dc952c
Update to latest GNUInstallDirs cmake module
...
This version correctly detects debians multiarch lib handling and
lets us remove the manually set CMAKE_LIB_INSTALL_DIRS from the rules
file.
2014-04-23 13:04:16 +02:00
Markus Goetz
f6711b2842
CMake: Find libraries also on Win host compile
2014-04-22 21:02:08 +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
9f8d867ce2
About correctly when Qt5Keychain isn't found
2014-04-07 17:41:33 +02:00
Daniel Molkentin
d416c97eac
Fix Qt5 detection
2014-04-07 17:38:30 +02:00
Daniel Molkentin
7d7d03071a
Add Copyright.txt for cmake modules
...
Fixes #1438
2014-04-07 01:27:59 +02:00
Daniel Molkentin
57c59850e1
Fix installation paths
2014-04-04 15:52:41 +02:00
Daniel Molkentin
4bcd620c29
Avoid build attempts with Qt4 on Windows and Linux
2014-04-04 09:29:01 +02:00
Daniel Molkentin
9822002480
Spell APPLICATION_SHORTNAME correctly
...
Fixes #1547
2014-03-28 15:56:35 +01:00
Daniel Molkentin
411cffd3d5
NSIS: libcrypto-10 dependency got lost somehow
2014-03-26 09:10:01 +01: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
4bf0a2b188
NSIS: depend on Qt5-based installations
2014-03-25 19:04:05 +01:00
Daniel Molkentin
d10aec6055
NSIS: Install owncloudcmd on Windows
2014-03-18 23:56:50 +01:00
Olivier Goffart
33289bde29
Merge remote-tracking branch 'origin/1.5'
...
Conflicts:
CMakeLists.txt
VERSION.cmake
src/CMakeLists.txt
2014-03-14 17:27:50 +01:00
