Commit Graph

10 Commits

Author SHA1 Message Date
Jonas Kvinge 1d17bee44a Merge with master and fix conflicts 2019-01-18 01:38:12 +01:00
John Maguire b57c5a77f7 Use c++0x instead of 11 for backwards compat 2018-12-05 14:02:01 +00:00
Jonas Kvinge 16bdd39c03 Merge remote-tracking branch 'upstream/master' into qt5-update 2018-11-29 23:21:54 +01:00
Jonas Kvinge 139bc1f5aa Convert NULL to nullptr (#6220) 2018-11-29 21:26:51 +00:00
Andreas Sturmlechner a4e362b9f7
Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules)
One usage of the macro remains in the bundled libmygpo-qt5. This should
be updated once the pending upstream fix was merged. qtsingleapplication
is already fixed upstream.
2018-04-16 01:33:15 +02:00
Chocobozzz 369ff1be23 Update cmakelists min version to 2.8.11 2015-06-11 12:10:07 +02:00
Chocobozzz 4d0e413fb9 Finally use of qtsingleapplication adapted to qt5 2015-04-16 15:06:00 +02:00
Chocobozzz e995685ecd Update singleapplication (use of a qt5 alternative) 2015-04-11 23:23:38 +02:00
David Sansome 63861f2ee5 Explicitly produce static libraries even when BUILD_SHARED_LIBS is set 2010-06-22 16:07:29 +00:00
John Maguire f9ad923f3a CMake support \o/
Also fixes xine deprecation messages.
2010-02-28 17:28:56 +00:00