Merge remote-tracking branch 'origin/Applications/17.04'

This commit is contained in:
Albert Astals Cid 2017-03-23 01:34:41 +01:00
commit d28d4e3e4f

2
part.h
View file

@ -199,7 +199,7 @@ class OKULARPART_EXPORT Part : public KParts::ReadWritePart, public Okular::Docu
void slotGetNewStuff();
void slotNewConfig();
void slotShowMenu(const Okular::Page *page, const QPoint &point);
void slotShowTOCMenu(const Okular::DocumentViewport &vp, const QPoint &point, const QString title);
void slotShowTOCMenu(const Okular::DocumentViewport &vp, const QPoint &point, const QString &title);
void slotShowProperties();
void slotShowEmbeddedFiles();
void slotShowLeftPanel();