Commit graph

7261 commits

Author SHA1 Message Date
Saheb Preet Singh bf673495fb added layers on the left sidebar 2015-05-27 19:26:56 +05:30
l10n daemon script 9b6e42ea29 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-05-24 04:22:09 +00:00
Alex Richardson c2fc0199b8 Use KPluginFactory::createInstance<Okular::Generator>()
Now that all generators have the necessary Q_INTERFACES() it works again
This restores the behaviour from before commit e4a4d400c3

REVIEW: 123466
2015-05-22 16:33:09 +01:00
Alex Richardson 1049dc188a Add Q_INTERFACES( Okular::Generator ) to all plugins
This seems to be required with KPluginFactory and Qt5 since without it
KPluginFactory::create<Okular::Generator>() always returns null.

For some reason this requires a complete rebuild before generatorstest
passes.

REVIEW: 123466
2015-05-22 16:33:09 +01:00
Alex Richardson 8059e5b686 Add a test to see whether generators can be loaded
REVIEW: 123466
2015-05-22 16:33:09 +01:00
Alex Richardson 0ef5903c73 Use ecm_add_test correctly
The first argument is not the target name but one of the source files.
2015-05-22 16:33:09 +01:00
Albert Astals Cid 6ac112ef84 Merge remote-tracking branch 'origin/Applications/15.04'
Conflicts:
	VERSION
	core/version.h
2015-05-22 06:14:55 +02:00
Albert Astals Cid 6a8a266d3c 0.22.2
For Applications 15.04.2
SVN_SILENT
2015-05-22 06:13:12 +02:00
Albert Astals Cid 3f55cc1e90 Try to fix Mac/clang build 2015-05-22 05:53:43 +02:00
René J.V. Bertin 42e03ce9bf Initialise PageViewPrivate::aFitWindowToPage to NULL and
check against NULL consistently before calling aFitWindowToPage->setEnabled().

BUG: 348000
REVIEW: 123876
2015-05-22 01:47:16 +02:00
Albert Astals Cid 8452e86b65 Fix porting mistake on next/prev page shortcuts
CCMAIL: lukas@kde.org
BUGS: 347109
2015-05-14 01:46:03 +02:00
Albert Astals Cid 146c6d85bb Merge remote-tracking branch 'origin/Applications/15.04' 2015-05-14 00:59:48 +02:00
Jonathan Doman 223092aa0e Fix embed mode detection
Wow, I have no idea how this happened. I wrote an big test case and spent a lot of time playing with tabs. Stephan Binner even told me about this a month ago, but I didn't quite understand the problem...
Broken embed mode detection means that the tabbed interface is disabled. It actually made it into release... ugh

REVIEW: 123680
2015-05-14 00:58:48 +02:00
Ivan Čukić c46b08c23f Make KActivities a required dependency
Our goal is better integration with Plasma and other KDE components.

We have made a conscious decision to reduce our code a bit by removing
the legacy #ifdefs. That way we do not have to support a build
configuration which is going to be used by just a tiny minority of our
users, and one that we are not terribly interested in. Without
KActivities, there is for example no support for recording and listing
of recent documents, PDF sharing etc etc, and we honestly believe that
the majority of our audience wants these features.

REVIEW: 123249
2015-05-05 00:19:28 +02:00
Albert Astals Cid 437acd5c2d Merge remote-tracking branch 'origin/Applications/15.04'
Conflicts:
	VERSION
	core/version.h
2015-05-02 14:53:51 +02:00
Albert Astals Cid cb9aa1559d 0.22.1
For Applications 15.04.1
SVN_SILENT
2015-05-02 14:49:49 +02:00
Heiko Becker 9685017e17 Merge remote-tracking branch 'origin/Applications/15.04' 2015-04-19 14:47:04 +02:00
Heiko Becker 966e19582c FindLibSpectre: Use FindPkgConfig instead of UsePkgConfig
The latter is deprecated and doesn't respect the PKG_CONFIG
environment variable which makes it easy to deal with differently
named pkg-config executables, e.g. arch-prefixed ones.

REVIEW: 123393
2015-04-19 14:42:57 +02:00
Alex Richardson dcf4d93abb Fix the export header not being found in interfaces/*.h
REVIEW: 123363
2015-04-16 00:54:32 +01:00
Albert Astals Cid e89283a6b5 Merge remote-tracking branch 'origin/Applications/15.04' 2015-04-16 00:11:30 +02:00
Albert Astals Cid aed8a9b3cd Fix crash on closing
Tell the document we're no longer an observer in the destructor
BUGS: 346149
FIXED-IN: KDE Applications 15.04.1
2015-04-16 00:10:52 +02:00
Andreas Cord-Landwehr ac258e49f1 Use generated version and CMake config files.
Replace both the package version file by a generated file, as well as
OkularConfig.cmake package configuration file.

Note that with this change the compatibility CMake variable OKULAR_FOUND
is not set anymore, use Okular_FOUND instead.

REVIEW: 123314
2015-04-15 21:55:35 +02:00
Alex Richardson 4a1c199e8e Remove unneeded target_include_directories() 2015-04-15 15:01:57 +01:00
Alex Richardson 475be2073a Fix INTERFACE_INCLUDE_DIRECTORIES for okularcore library 2015-04-15 14:56:37 +01:00
Alex Richardson cfc82ee9b0 Be explicit about the target dependencies 2015-04-14 20:04:26 +01:00
Albert Astals Cid 82882ec941 Merge remote-tracking branch 'origin/Applications/15.04' 2015-04-14 01:39:37 +02:00
René J.V. Bertin 7f6c9987ab Fix crashes on Mac
Seems Mac and/or clang need these to be exported

BUGS: 345765
2015-04-14 01:39:14 +02:00
Albert Astals Cid 8bc66f6505 Merge remote-tracking branch 'origin/Applications/15.04'
Conflicts:
	VERSION
	core/version.h
2015-04-07 22:38:35 +02:00
Albert Astals Cid 8f854256ef And forgot to increase this one ^_^
GIT_SILENT
2015-04-07 22:37:49 +02:00
Albert Astals Cid bf203fd1a9 Prepare for the KDE Applications 15.04.0 release
GIT_SILENT
2015-04-07 22:37:13 +02:00
Alex Richardson 0436b34a98 Use QThread::msleep() instead of platform-specific sleep functions 2015-04-04 13:52:29 +02:00
Marco Martin af3b4cba17 use the new kpackage-based runtime for the QML app
remove old dead code, the okular active app is now completely
qml and KPackage based
2015-04-03 16:56:00 +02:00
Montel Laurent 2708e9ce6d Merge remote-tracking branch 'origin/master' into frameworks 2015-04-01 19:46:00 +02:00
Andreas Cord-Landwehr 9e603cc923 Fix include dir and library search.
This fixes two issues:
1. ${_okularBaseDir} provides a path to <somedir>/lib which prevents
   the include dir to be found
2. the find_library search does not consider the architecture prefixes

REVIEW: 123176
2015-03-31 18:21:51 +02:00
Albert Astals Cid 72ca504ce1 Merge remote-tracking branch 'origin/Applications/15.04' 2015-03-30 20:06:17 +02:00
Ronnie Thomas 0877dfd5f8 Fix error messags on cmdline arguments
The --print and the --page arguments were showing wrong error messages. This patch fixes it.

REVIEW: 123163
2015-03-30 20:05:40 +02:00
Albert Astals Cid decb184680 Merge remote-tracking branch 'origin/Applications/15.04'
Conflicts:
	VERSION
	core/version.h
2015-03-25 23:22:46 +01:00
Albert Astals Cid c11c734caf RC version 2015-03-25 23:02:26 +01:00
Montel Laurent 5d727ee965 Fix includes 2015-03-20 08:55:32 +01:00
Montel Laurent 2568463061 Port to QCDebug 2015-03-20 08:48:17 +01:00
Montel Laurent fca577bd6f Merge remote-tracking branch 'origin/master' into frameworks 2015-03-20 08:39:06 +01:00
Albert Astals Cid b6239700d8 Merge remote-tracking branch 'origin/Applications/15.04' 2015-03-20 00:39:48 +01:00
Albert Astals Cid 250eccf530 plucker: Also accept f as false
This bug is present at upstream unpluck too, but given the cvs code hasn't
been touched in ages i have not reported it there
2015-03-20 00:34:46 +01:00
Montel Laurent 629882497b Rename icons 2015-03-19 08:48:11 +01:00
Albert Astals Cid 87a0457472 Merge remote-tracking branch 'origin/Applications/15.04'
Conflicts:
	VERSION
	core/version.h
2015-03-18 23:54:34 +01:00
Albert Astals Cid bb00a153e6 Update for 15.04 Beta 3
SVN_SILENT
2015-03-18 23:53:47 +01:00
Montel Laurent 080dba35b2 kdelibs4support-- 2015-03-17 23:15:20 +01:00
Montel Laurent ae30a7fc51 USe new connect api 2015-03-17 09:13:17 +01:00
Montel Laurent 3580f0089b Fix includes 2015-03-17 09:06:01 +01:00
Montel Laurent 778f5bb9cb Reactivate it 2015-03-17 09:03:30 +01:00