summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-05-11 13:34:35 +0200
committerMontel Laurent <[email protected]>2016-05-11 13:34:35 +0200
commit6dabb1b2ca915c4943ce6e21a0dc2efb21f099c2 (patch)
tree625509641779f5b8cf3f400dd7bc3c58fe5440ff
parent909890cae14715791f25838d656a3cc58d80f43d (diff)
Use new api
-rw-r--r--CMakeLists.txt2
-rw-r--r--accountwizard/CMakeLists.txt2
-rw-r--r--akonadiconsole/CMakeLists.txt2
-rw-r--r--akregator/CMakeLists.txt2
-rw-r--r--akregator/src/articleviewer-ng/webengine/articleviewerwebengine.cpp14
-rw-r--r--akregator/src/articleviewer-ng/webengine/articleviewerwebengine.h2
-rw-r--r--akregator/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp2
-rw-r--r--blogilo/CMakeLists.txt2
-rw-r--r--grantleeeditor/CMakeLists.txt2
-rw-r--r--importwizard/CMakeLists.txt2
-rw-r--r--kmail/CMakeLists.txt2
-rw-r--r--sieveeditor/CMakeLists.txt2
12 files changed, 12 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d35c74..b83f003 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ else()
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
+ set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
diff --git a/accountwizard/CMakeLists.txt b/accountwizard/CMakeLists.txt
index 7d04e32..00842a6 100644
--- a/accountwizard/CMakeLists.txt
+++ b/accountwizard/CMakeLists.txt
@@ -44,7 +44,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${accountwizard_SOURCE_DIR})
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml DBus Test)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
+ set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
diff --git a/akonadiconsole/CMakeLists.txt b/akonadiconsole/CMakeLists.txt
index fce4234..2ed0712 100644
--- a/akonadiconsole/CMakeLists.txt
+++ b/akonadiconsole/CMakeLists.txt
@@ -42,7 +42,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akonadiconsole_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
+ set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(KCALENDARCORE_LIB_VERSION "5.2.40")
diff --git a/akregator/CMakeLists.txt b/akregator/CMakeLists.txt
index b0adf69..4ea0d88 100644
--- a/akregator/CMakeLists.txt
+++ b/akregator/CMakeLists.txt
@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
find_package(Grantlee5 "5.0" CONFIG REQUIRED)
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
+ set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
diff --git a/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.cpp b/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
index 1711d09..b739c9c 100644
--- a/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
+++ b/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
@@ -57,7 +57,6 @@ using namespace Akregator;
ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *parent)
: WebEngineViewer::WebEngineView(parent),
mActionCollection(ac),
- mCurrentPosition(0),
mLastButtonClicked(LeftButton),
mViewerPluginToolManager(Q_NULLPTR)
{
@@ -229,7 +228,7 @@ void ArticleViewerWebEngine::slotLoadFinished()
void ArticleViewerWebEngine::slotLoadStarted()
{
mWebEngineViewAccessKey->hideAccessKeys();
- mCurrentPosition = 0;
+ clearRelativePosition();
setCursor(Qt::WaitCursor);
}
@@ -346,19 +345,10 @@ void ArticleViewerWebEngine::setArticleAction(ArticleViewerWebEngine::ArticleAct
Q_EMIT articleAction(type, articleId, feed);
}
-void ArticleViewerWebEngine::saveCurrentPosition()
-{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
- mCurrentPosition = page()->scrollPosition().y();
- qDebug() << "void ArticleViewerWebEngine::saveCurrentPosition()"<<mCurrentPosition;
-#endif
-}
-
void ArticleViewerWebEngine::restoreCurrentPosition()
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
- qDebug()<<" void ArticleViewerWebEngine::restoreCurrentPosition()" << mCurrentPosition;
- mPageEngine->runJavaScript(WebEngineViewer::WebEngineScript::scrollToRelativePosition(mCurrentPosition));
+ mPageEngine->runJavaScript(WebEngineViewer::WebEngineScript::scrollToRelativePosition(relativePosition()));
#endif
//TODO
}
diff --git a/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.h b/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.h
index 5443d55..7cff817 100644
--- a/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.h
+++ b/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.h
@@ -68,7 +68,6 @@ public:
void disableIntroduction();
void setArticleAction(ArticleViewerWebEngine::ArticleAction type, const QString &articleId, const QString &feed);
- void saveCurrentPosition();
void restoreCurrentPosition();
void createViewerPluginToolManager(KActionCollection *ac, QWidget *parent);
@@ -134,7 +133,6 @@ protected:
QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features);
WebEngineViewer::NetworkAccessManagerWebEngine *mNetworkAccessManager;
private:
- qreal mCurrentPosition;
MousePressedButtonType mLastButtonClicked;
MessageViewer::ViewerPluginToolManager *mViewerPluginToolManager;
WebEngineViewer::WebEngineAccessKey *mWebEngineViewAccessKey;
diff --git a/akregator/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp b/akregator/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
index 754a027..8d575b3 100644
--- a/akregator/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
+++ b/akregator/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
@@ -101,7 +101,7 @@ void ArticleViewerWebEngineWidgetNg::slotSpeakText()
void ArticleViewerWebEngineWidgetNg::saveCurrentPosition()
{
- mArticleViewerNg->saveCurrentPosition();
+ mArticleViewerNg->saveRelativePosition();
}
void ArticleViewerWebEngineWidgetNg::restoreCurrentPosition()
diff --git a/blogilo/CMakeLists.txt b/blogilo/CMakeLists.txt
index 1b0342d..6b2e838 100644
--- a/blogilo/CMakeLists.txt
+++ b/blogilo/CMakeLists.txt
@@ -39,7 +39,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${blogilo_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql WebEngine WebEngineWidgets)
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
+ set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
# Find KF5 package
find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
diff --git a/grantleeeditor/CMakeLists.txt b/grantleeeditor/CMakeLists.txt
index 4e0d83b..7623fa3 100644
--- a/grantleeeditor/CMakeLists.txt
+++ b/grantleeeditor/CMakeLists.txt
@@ -29,7 +29,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${grantleeditor_SOURCE_DIR})
set(KDEPIM_VERSION_NUMBER "5.2.46")
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
+ set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
diff --git a/importwizard/CMakeLists.txt b/importwizard/CMakeLists.txt
index 2d3d40c..6d423c9 100644
--- a/importwizard/CMakeLists.txt
+++ b/importwizard/CMakeLists.txt
@@ -41,7 +41,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
+ set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.40")
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 2252e19..f089123 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -63,7 +63,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
set(LIBGRAVATAR_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
+ set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
diff --git a/sieveeditor/CMakeLists.txt b/sieveeditor/CMakeLists.txt
index da0e558..b81d55a 100644
--- a/sieveeditor/CMakeLists.txt
+++ b/sieveeditor/CMakeLists.txt
@@ -34,7 +34,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR})
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
+ set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKSIEVE_LIB_VERSION_LIB "5.2.41")