diff -Nru gwenview-15.04.2/app/CMakeLists.txt gwenview-15.07.90/app/CMakeLists.txt
--- gwenview-15.04.2/app/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/app/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -1,5 +1,6 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${EXIV2_INCLUDE_DIR}
     )
 
 # For lib/gwenviewconfig.h and config-gwenview.h
@@ -65,7 +66,8 @@
         )
 endif()
 
-kde4_add_app_icon(gwenview_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-gwenview.png")
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/*-apps-gwenview.png")
+ecm_add_app_icon(gwenview_SRCS ICONS ${ICONS_SRCS})
 
 add_executable(gwenview ${gwenview_SRCS})
 
@@ -83,14 +85,14 @@
 endif()
 
 install(TARGETS gwenview
-    ${INSTALL_TARGETS_DEFAULT_ARGS})
+    ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES gwenviewui.rc
-    DESTINATION ${KXMLGUI_INSTALL_DIR}/gwenview)
+    DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/gwenview)
 
 install(PROGRAMS org.kde.gwenview.desktop
-    DESTINATION ${XDG_APPS_INSTALL_DIR})
+    DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES gwenview.appdata.xml
-    DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
+    DESTINATION ${KDE_INSTALL_DATAROOTDIR}/appdata)
 install(FILES slideshow.desktop
-    DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus)
+    DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus)
diff -Nru gwenview-15.04.2/app/configdialog.cpp gwenview-15.07.90/app/configdialog.cpp
--- gwenview-15.04.2/app/configdialog.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/app/configdialog.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -24,7 +24,6 @@
 // Qt
 
 // KDE
-#include <KGlobalSettings>
 #include <KLocalizedString>
 
 // Local
@@ -33,6 +32,7 @@
 #include "ui_advancedconfigpage.h"
 #include <lib/gwenviewconfig.h>
 #include <lib/invisiblebuttongroup.h>
+#include <QFontDatabase>
 
 namespace Gwenview
 {
@@ -110,7 +110,7 @@
     widget = setupPage(d->mAdvancedConfigPage);
     pageItem = addPage(widget, i18n("Advanced"));
     pageItem->setIcon(QIcon::fromTheme("preferences-other"));
-    d->mAdvancedConfigPage.cacheHelpLabel->setFont(KGlobalSettings::smallestReadableFont());
+    d->mAdvancedConfigPage.cacheHelpLabel->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
 
     updateViewBackgroundFrame();
 }
diff -Nru gwenview-15.04.2/app/fileoperations.cpp gwenview-15.07.90/app/fileoperations.cpp
--- gwenview-15.04.2/app/fileoperations.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/app/fileoperations.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -28,7 +28,7 @@
 #include <QFileDialog>
 
 // KDE
-#include <KInputDialog>
+#include <QInputDialog>
 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>
 #include <KIO/Job>
@@ -201,12 +201,10 @@
 
 void rename(const QUrl &oldUrl, QWidget* parent)
 {
-    QString name = KInputDialog::getText(
+    QString name = QInputDialog::getText(parent, 
                        i18nc("@title:window", "Rename") /* caption */,
                        xi18n("Rename <filename>%1</filename> to:", oldUrl.fileName()) /* label */,
-                       oldUrl.fileName() /* value */,
-                       0 /* ok */,
-                       parent
+                       QLineEdit::Normal, oldUrl.fileName() /* value */
                    );
     if (name.isEmpty() || name == oldUrl.fileName()) {
         return;
diff -Nru gwenview-15.04.2/app/main.cpp gwenview-15.07.90/app/main.cpp
--- gwenview-15.04.2/app/main.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/app/main.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -121,8 +121,8 @@
     KLocalizedString::setApplicationDomain("gwenview");
     QScopedPointer<KAboutData> aboutData(
         Gwenview::createAboutData(
-            QStringLiteral("gwenview"), /* component name */
-            i18n("Gwenview")            /* display name */
+            QStringLiteral("org.kde.gwenview"), /* component name */
+            i18n("Gwenview")                    /* display name */
         ));
     aboutData->setShortDescription(i18n("An Image Viewer"));
 
diff -Nru gwenview-15.04.2/app/org.kde.gwenview.desktop gwenview-15.07.90/app/org.kde.gwenview.desktop
--- gwenview-15.04.2/app/org.kde.gwenview.desktop	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/app/org.kde.gwenview.desktop	2015-08-05 19:47:32.000000000 +0000
@@ -67,6 +67,7 @@
 Name[zh_TW]=影像檢視_Gwenview
 GenericName=KDE Image Viewer
 GenericName[ar]=عارض صور كدي
+GenericName[ast]=Visor d'imáxenes KDE
 GenericName[bg]=Преглед на изображения в KDE
 GenericName[bs]=KDE Prikazivač slika
 GenericName[ca]=Visor d'imatges del KDE
diff -Nru gwenview-15.04.2/app/sidebar.cpp gwenview-15.07.90/app/sidebar.cpp
--- gwenview-15.04.2/app/sidebar.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/app/sidebar.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -30,8 +30,8 @@
 #include <QIcon>
 
 // KDE
-#include <KGlobalSettings>
 #include <KIconLoader>
+#include <QFontDatabase>
 
 // Local
 
@@ -206,7 +206,7 @@
 : QTabWidget(parent)
 , d(new SideBarPrivate)
 {
-    setFont(KGlobalSettings::smallestReadableFont());
+    setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
     tabBar()->setDocumentMode(true);
     tabBar()->setUsesScrollButtons(false);
     tabBar()->setFocusPolicy(Qt::NoFocus);
diff -Nru gwenview-15.04.2/app/slideshow.desktop gwenview-15.07.90/app/slideshow.desktop
--- gwenview-15.04.2/app/slideshow.desktop	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/app/slideshow.desktop	2015-08-05 19:47:32.000000000 +0000
@@ -6,7 +6,7 @@
 [Desktop Action slideshow]
 Name=Start a Slideshow
 Name[ar]=ابدأ عرض شرائح
-Name[ast]=Entamar una presentación
+Name[ast]=Aniciar una presentación
 Name[bg]=Пускане на прожекция
 Name[bs]=Pokreni slajdšou
 Name[ca]=Inicia una presentació amb diapositives
diff -Nru gwenview-15.04.2/app/startmainpage.cpp gwenview-15.07.90/app/startmainpage.cpp
--- gwenview-15.04.2/app/startmainpage.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/app/startmainpage.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -36,7 +36,6 @@
 
 // KDE
 #include <KFilePlacesModel>
-#include <KGlobalSettings>
 #include <KLocalizedString>
 
 // Local
diff -Nru gwenview-15.04.2/CMakeLists.txt gwenview-15.07.90/CMakeLists.txt
--- gwenview-15.04.2/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -1,11 +1,17 @@
 project(gwenview)
 
+# KDE Application Version, managed by release script
+set (KDE_APPLICATIONS_VERSION_MAJOR "15")
+set (KDE_APPLICATIONS_VERSION_MINOR "07")
+set (KDE_APPLICATIONS_VERSION_MICRO "90")
+set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
+
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 
 cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
 set (QT_MIN_VERSION "5.2.0")
 
-find_package(ECM 1.2.0 REQUIRED NO_MODULE)
+find_package(ECM 1.7.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 include(KDEInstallDirs)
@@ -16,16 +22,22 @@
 include(ECMSetupVersion)
 include(ECMMarkNonGuiExecutable)
 include(ECMGenerateHeaders)
+include(ECMAddAppIcon)
 include(GenerateExportHeader)
 include(FeatureSummary)
 
+## Generate header with version number
+ecm_setup_version(${KDE_APPLICATIONS_VERSION}
+                  VARIABLE_PREFIX GWENVIEW
+                  VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/lib/gwenview_version.h"
+)
 
 ## CMake options
 set(GWENVIEW_SEMANTICINFO_BACKEND_NONE OFF)
 set(GWENVIEW_SEMANTICINFO_BACKEND_FAKE OFF)
 set(GWENVIEW_SEMANTICINFO_BACKEND_BALOO OFF)
 
-set(GWENVIEW_SEMANTICINFO_BACKEND "None" CACHE STRING "Semantic info backend for Gwenview (Baloo/Fake/None)")
+set(GWENVIEW_SEMANTICINFO_BACKEND "Baloo" CACHE STRING "Semantic info backend for Gwenview (Baloo/Fake/None)")
 
 # Init GWENVIEW_SEMANTICINFO_BACKEND_* vars
 if(GWENVIEW_SEMANTICINFO_BACKEND STREQUAL "None")
@@ -36,7 +48,7 @@
     set(GWENVIEW_SEMANTICINFO_BACKEND_BALOO ON)
 endif()
 
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Test Concurrent Svg OpenGL)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Concurrent Svg OpenGL)
 
 find_package(Phonon4Qt5 4.6.60 NO_MODULE)
 include_directories(BEFORE ${PHONON_INCLUDES})
diff -Nru gwenview-15.04.2/color-schemes/CMakeLists.txt gwenview-15.07.90/color-schemes/CMakeLists.txt
--- gwenview-15.04.2/color-schemes/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/color-schemes/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -1,4 +1,4 @@
 install(
     FILES fullscreen.colors
-    DESTINATION ${DATA_INSTALL_DIR}/gwenview/color-schemes/
+    DESTINATION ${KDE_INSTALL_DATADIR}/gwenview/color-schemes/
     )
diff -Nru gwenview-15.04.2/cursors/CMakeLists.txt gwenview-15.07.90/cursors/CMakeLists.txt
--- gwenview-15.04.2/cursors/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/cursors/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -1,4 +1,4 @@
 install(
     FILES zoom.png
-    DESTINATION ${DATA_INSTALL_DIR}/gwenview/cursors/
+    DESTINATION ${KDE_INSTALL_DATADIR}/gwenview/cursors/
     )
diff -Nru gwenview-15.04.2/debian/changelog gwenview-15.07.90/debian/changelog
--- gwenview-15.04.2/debian/changelog	2015-08-06 06:12:38.000000000 +0000
+++ gwenview-15.07.90/debian/changelog	2015-08-18 08:29:30.000000000 +0000
@@ -1,8 +1,9 @@
-gwenview (4:15.04.2-0ubuntu2) wily; urgency=medium
+gwenview (4:15.07.90-0ubuntu1) wily; urgency=medium
 
-  * No-change rebuild against libexiv2-14.
+  * New upstream release
+  * new upstream beta release
 
- -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 06 Aug 2015 08:12:38 +0200
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 18 Aug 2015 09:29:30 +0100
 
 gwenview (4:15.04.2-0ubuntu1) wily; urgency=medium
 
diff -Nru gwenview-15.04.2/doc/CMakeLists.txt gwenview-15.07.90/doc/CMakeLists.txt
--- gwenview-15.04.2/doc/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/doc/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -1,4 +1,4 @@
 ########### install files ###############
 #
 #
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR gwenview)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR gwenview)
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/128-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/128-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/128-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/128-apps-gwenview.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/16-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/16-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/16-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/16-apps-gwenview.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/22-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/22-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/22-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/22-apps-gwenview.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/32-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/32-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/32-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/32-apps-gwenview.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/48-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/48-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/48-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/48-apps-gwenview.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/64-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/64-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/64-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/64-apps-gwenview.png differ
diff -Nru gwenview-15.04.2/icons/CMakeLists.txt gwenview-15.07.90/icons/CMakeLists.txt
--- gwenview-15.04.2/icons/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/icons/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -1,13 +1,13 @@
-ecm_install_icons( ICONS hi128-actions-document-share.png
-hi128-apps-gwenview.png
-hi16-actions-document-share.png
-hi16-apps-gwenview.png
-hi22-actions-document-share.png
-hi22-apps-gwenview.png
-hi32-actions-document-share.png
-hi32-apps-gwenview.png
-hi48-actions-document-share.png
-hi48-apps-gwenview.png
-hi64-actions-document-share.png
-hi64-apps-gwenview.png
-DESTINATION ${ICON_INSTALL_DIR} )
+ecm_install_icons( ICONS 128-actions-document-share.png
+128-apps-gwenview.png
+16-actions-document-share.png
+16-apps-gwenview.png
+22-actions-document-share.png
+22-apps-gwenview.png
+32-actions-document-share.png
+32-apps-gwenview.png
+48-actions-document-share.png
+48-apps-gwenview.png
+64-actions-document-share.png
+64-apps-gwenview.png
+DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor )
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi128-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi128-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi128-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi128-apps-gwenview.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi16-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi16-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi16-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi16-apps-gwenview.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi22-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi22-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi22-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi22-apps-gwenview.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi32-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi32-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi32-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi32-apps-gwenview.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi48-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi48-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi48-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi48-apps-gwenview.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi64-actions-document-share.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi64-actions-document-share.png differ
Binary files /tmp/dEsHLS23IQ/gwenview-15.04.2/icons/hi64-apps-gwenview.png and /tmp/q_IjwaKZBn/gwenview-15.07.90/icons/hi64-apps-gwenview.png differ
diff -Nru gwenview-15.04.2/images/CMakeLists.txt gwenview-15.07.90/images/CMakeLists.txt
--- gwenview-15.04.2/images/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/images/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -1,3 +1,3 @@
 install(FILES background.png
-    DESTINATION ${DATA_INSTALL_DIR}/gwenview/images/
+    DESTINATION ${KDE_INSTALL_DATADIR}/gwenview/images/
     )
diff -Nru gwenview-15.04.2/importer/CMakeLists.txt gwenview-15.07.90/importer/CMakeLists.txt
--- gwenview-15.04.2/importer/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/importer/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -27,7 +27,8 @@
     thumbnailpage.ui
     )
 
-kde4_add_app_icon(importer_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-gwenview-importer.png")
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-gwenview-importer.png")
+ecm_add_app_icon(importer_SRCS ICONS ${ICONS_SRCS})
 
 kconfig_add_kcfg_files(importer_SRCS
     importerconfig.kcfgc
@@ -48,8 +49,8 @@
     )
 
 install(TARGETS gwenview_importer
-    ${INSTALL_TARGETS_DEFAULT_ARGS})
+    ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES gwenview_importer.desktop
     gwenview_importer_camera.desktop
-    DESTINATION ${DATA_INSTALL_DIR}/solid/actions/)
+    DESTINATION ${KDE_INSTALL_DATADIR}/solid/actions/)
diff -Nru gwenview-15.04.2/importer/gwenview_importer_camera.desktop gwenview-15.07.90/importer/gwenview_importer_camera.desktop
--- gwenview-15.04.2/importer/gwenview_importer_camera.desktop	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/importer/gwenview_importer_camera.desktop	2015-08-05 19:47:32.000000000 +0000
@@ -8,7 +8,7 @@
 Icon=gwenview
 Name=Download Photos with Gwenview
 Name[ar]=نزل الصور بجوينفيو
-Name[ast]=Descarga Semeyes con Gwenview
+Name[ast]=Descarga semeyes con Gwenview
 Name[bg]=Изтегляне на снимки с Gwenview
 Name[bs]=Preuzimanje fotografija Gvenvjuom
 Name[ca]=Descarrega fotos amb el Gwenview
@@ -60,7 +60,7 @@
 Name[th]=ดาวน์โหลดภาพถ่ายด้วยเกวนวิว
 Name[tr]=Gwenview ile Fotoğrafları İndir
 Name[ug]=سۈرەتلەرنى Gwenview بىلەن چۈشۈرۈش
-Name[uk]=Звантажити фотографії за допомогою Gwenview
+Name[uk]=Отримати фотографії за допомогою Gwenview
 Name[x-test]=xxDownload Photos with Gwenviewxx
 Name[zh_CN]=用 Gwenview 下载照片
 Name[zh_TW]=用 Gwenview 下載相片
diff -Nru gwenview-15.04.2/importer/gwenview_importer.desktop gwenview-15.07.90/importer/gwenview_importer.desktop
--- gwenview-15.04.2/importer/gwenview_importer.desktop	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/importer/gwenview_importer.desktop	2015-08-05 19:47:32.000000000 +0000
@@ -9,7 +9,7 @@
 Icon=gwenview
 Name=Download Photos with Gwenview
 Name[ar]=نزل الصور بجوينفيو
-Name[ast]=Descarga Semeyes con Gwenview
+Name[ast]=Descarga semeyes con Gwenview
 Name[bg]=Изтегляне на снимки с Gwenview
 Name[bs]=Preuzimanje fotografija Gvenvjuom
 Name[ca]=Descarrega fotos amb el Gwenview
@@ -61,7 +61,7 @@
 Name[th]=ดาวน์โหลดภาพถ่ายด้วยเกวนวิว
 Name[tr]=Gwenview ile Fotoğrafları İndir
 Name[ug]=سۈرەتلەرنى Gwenview بىلەن چۈشۈرۈش
-Name[uk]=Звантажити фотографії за допомогою Gwenview
+Name[uk]=Отримати фотографії за допомогою Gwenview
 Name[x-test]=xxDownload Photos with Gwenviewxx
 Name[zh_CN]=用 Gwenview 下载照片
 Name[zh_TW]=用 Gwenview 下載相片
diff -Nru gwenview-15.04.2/importer/importdialog.cpp gwenview-15.07.90/importer/importdialog.cpp
--- gwenview-15.04.2/importer/importdialog.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/importer/importdialog.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -38,6 +38,7 @@
 #include <KService>
 #include <KStandardGuiItem>
 #include <Solid/Device>
+#include <QStandardPaths>
 
 // Local
 #include "dialogpage.h"
@@ -183,7 +184,7 @@
 
     KUrl url = ImporterConfig::destinationUrl();
     if (!url.isValid()) {
-        url = KUrl::fromPath(KGlobalSettings::picturesPath());
+        url = QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation));
         int year = QDate::currentDate().year();
         url.addPath(QString::number(year));
     }
@@ -243,7 +244,7 @@
 {
     KUrl url = d->mThumbnailPage->destinationUrl();
     ImporterConfig::setDestinationUrl(url);
-    ImporterConfig::self()->writeConfig();
+    ImporterConfig::self()->save();
 
     d->mCentralWidget->setCurrentWidget(d->mProgressPage);
     d->mImporter->setAutoRenameFormat(
diff -Nru gwenview-15.04.2/importer/importerconfigdialog.cpp gwenview-15.07.90/importer/importerconfigdialog.cpp
--- gwenview-15.04.2/importer/importerconfigdialog.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/importer/importerconfigdialog.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -51,7 +51,7 @@
         end = map.constEnd();
         for (; it != end; ++it) {
             QString keyword = '{' + it.key() + '}';
-            QString explanation = Qt::escape(it.value());
+            QString explanation = it.value().toHtmlEscaped();
             QString link = QString("<a href='%1'>%1</a>").arg(keyword);
             helpText += "<li>" + i18nc("%1 is the importer keyword, %2 is keyword explanation", "%1: %2", link, explanation) + "</li>";
         }
@@ -96,7 +96,7 @@
 void ImporterConfigDialog::updatePreview()
 {
     FileNameFormater formater(d->kcfg_AutoRenameFormat->text());
-    d->mPreviewOutputLabel->setText(formater.format(KUrl::fromPath('/' + PREVIEW_FILENAME), PREVIEW_DATETIME));
+    d->mPreviewOutputLabel->setText(formater.format(QUrl::fromLocalFile('/' + PREVIEW_FILENAME), PREVIEW_DATETIME));
 }
 
 } // namespace
diff -Nru gwenview-15.04.2/importer/importer.cpp gwenview-15.07.90/importer/importer.cpp
--- gwenview-15.04.2/importer/importer.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/importer/importer.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -43,6 +43,7 @@
 #include <fileutils.h>
 #include <filenameformater.h>
 #include <lib/timeutils.h>
+#include <QDir>
 
 namespace Gwenview
 {
@@ -76,7 +77,7 @@
         Q_ASSERT(url.isLocalFile());
         // FIXME: Support remote urls
 
-        if (!KStandardDirs::makeDir(url.toLocalFile())) {
+        if (!QDir().mkpath(url.toLocalFile())) {
             emitError(i18n("Could not create destination folder."));
             return false;
         }
diff -Nru gwenview-15.04.2/importer/thumbnailpage.cpp gwenview-15.07.90/importer/thumbnailpage.cpp
--- gwenview-15.04.2/importer/thumbnailpage.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/importer/thumbnailpage.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -232,7 +232,7 @@
 : d(new ThumbnailPagePrivate)
 {
     d->q = this;
-    d->mUrlMap.setConfigGroup(KConfigGroup(KGlobal::config(), URL_FOR_BASE_URL_GROUP));
+    d->mUrlMap.setConfigGroup(KConfigGroup(KSharedConfig::openConfig(), URL_FOR_BASE_URL_GROUP));
     d->setupUi(this);
     d->setupIcons();
     d->setupDirModel();
diff -Nru gwenview-15.04.2/lib/about.cpp gwenview-15.07.90/lib/about.cpp
--- gwenview-15.04.2/lib/about.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/about.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -20,7 +20,7 @@
 #include "about.h"
 
 // Local
-#include <version.h>
+#include "gwenview_version.h"
 
 // KDE
 #include <KAboutData>
@@ -34,7 +34,7 @@
 
 KAboutData* createAboutData(const QString& appName, const QString& programName)
 {
-    KAboutData* data = new KAboutData(appName, programName, GWENVIEW_VERSION);
+    KAboutData* data = new KAboutData(appName, programName, QStringLiteral(GWENVIEW_VERSION_STRING));
     data->setLicense(KAboutLicense::GPL);
     data->setCopyrightStatement(i18n("Copyright 2000-2014 Gwenview authors"));
     data->addAuthor(
diff -Nru gwenview-15.04.2/lib/CMakeLists.txt gwenview-15.07.90/lib/CMakeLists.txt
--- gwenview-15.04.2/lib/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -248,4 +248,4 @@
         )
 endif()
 
-install(TARGETS gwenviewlib ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
+install(TARGETS gwenviewlib ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
diff -Nru gwenview-15.04.2/lib/cms/cmsprofile.cpp gwenview-15.07.90/lib/cms/cmsprofile.cpp
--- gwenview-15.04.2/lib/cms/cmsprofile.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/cms/cmsprofile.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -241,11 +241,16 @@
     }
 #endif
     if (!hProfile) {
-        hProfile = cmsCreate_sRGBProfile();
+        return getSRgbProfile();
     }
     return Profile::Ptr(new Profile(hProfile));
 }
 
+Profile::Ptr Profile::getSRgbProfile()
+{
+    return Profile::Ptr(new Profile(cmsCreate_sRGBProfile()));
+}
+
 } // namespace Cms
 
 } // namespace Gwenview
diff -Nru gwenview-15.04.2/lib/cms/cmsprofile.h gwenview-15.07.90/lib/cms/cmsprofile.h
--- gwenview-15.04.2/lib/cms/cmsprofile.h	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/cms/cmsprofile.h	2015-08-05 19:47:32.000000000 +0000
@@ -67,6 +67,7 @@
     static Profile::Ptr loadFromImageData(const QByteArray& data, const QByteArray& format);
     static Profile::Ptr loadFromExiv2Image(const Exiv2::Image* image);
     static Profile::Ptr getMonitorProfile();
+    static Profile::Ptr getSRgbProfile();
 
 private:
     Profile(cmsHPROFILE);
diff -Nru gwenview-15.04.2/lib/crop/cropwidget.cpp gwenview-15.07.90/lib/crop/cropwidget.cpp
--- gwenview-15.04.2/lib/crop/cropwidget.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/crop/cropwidget.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -30,11 +30,11 @@
 
 // KDE
 #include <KDialog>
-#include <KGlobalSettings>
 #include <KLocalizedString>
 
 // Local
 #include <lib/documentview/rasterimageview.h>
+#include <QFontDatabase>
 #include "croptool.h"
 #include "signalblocker.h"
 #include "ui_cropwidget.h"
@@ -205,7 +205,7 @@
     d->mUpdatingFromCropTool = false;
     d->mCropTool = cropTool;
     d->setupUi(this);
-    setFont(KGlobalSettings::smallestReadableFont());
+    setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
     layout()->setMargin(KDialog::marginHint());
     layout()->setSizeConstraint(QLayout::SetFixedSize);
 
diff -Nru gwenview-15.04.2/lib/documentview/loadingindicator.cpp gwenview-15.07.90/lib/documentview/loadingindicator.cpp
--- gwenview-15.04.2/lib/documentview/loadingindicator.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/documentview/loadingindicator.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -24,6 +24,7 @@
 // Local
 
 // KDE
+#include <KIconLoader>
 #include <KPixmapSequence>
 
 // Qt
@@ -43,10 +44,10 @@
 
     LoadingIndicatorPrivate(LoadingIndicator* qq)
     : q(qq)
-    , mSequence("process-working", 22)
     , mIndex(0)
     , mTimer(new QTimer(qq))
     {
+        mSequence = KIconLoader::global()->loadPixmapSequence(QStringLiteral("process-working"), 22);
         mTimer->setInterval(100);
         QObject::connect(mTimer, SIGNAL(timeout()), q, SLOT(showNextFrame()));
     }
diff -Nru gwenview-15.04.2/lib/documentview/rasterimageview.cpp gwenview-15.07.90/lib/documentview/rasterimageview.cpp
--- gwenview-15.04.2/lib/documentview/rasterimageview.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/documentview/rasterimageview.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -81,7 +81,9 @@
 
         Cms::Profile::Ptr profile = q->document()->cmsProfile();
         if (!profile) {
-            return;
+            // The assumption that something unmarked is *probably* sRGB is better than failing to apply any transform when one
+            // has a wide-gamut screen.
+            profile = Cms::Profile::getSRgbProfile();
         }
         Cms::Profile::Ptr monitorProfile = Cms::Profile::getMonitorProfile();
         if (!monitorProfile) {
@@ -95,8 +97,13 @@
         case QImage::Format_ARGB32:
             cmsFormat = TYPE_BGRA_8;
             break;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+        case QImage::Format_Grayscale8:
+            cmsFormat = TYPE_GRAY_8;
+            break;
+#endif
         default:
-            qWarning() << "This image has a color profile, but Gwenview can only apply color profile on RGB32 or ARGB32 images";
+            qWarning() << "Gwenview can only apply color profile on RGB32 or ARGB32 images";
             return;
         }
         mDisplayTransform = cmsCreateTransform(profile->handle(), cmsFormat,
diff -Nru gwenview-15.04.2/lib/imagescaler.cpp gwenview-15.07.90/lib/imagescaler.cpp
--- gwenview-15.04.2/lib/imagescaler.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/imagescaler.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -129,7 +129,6 @@
     const qreal REAL_DELTA = 0.001;
     if (qAbs(d->mZoom - 1.0) < REAL_DELTA) {
         QImage tmp = d->mDocument->image().copy(rect);
-        tmp = tmp.convertToFormat(QImage::Format_ARGB32_Premultiplied);
         scaledRect(rect.left(), rect.top(), tmp);
         return;
     }
@@ -193,7 +192,6 @@
 
     QImage tmp;
     tmp = image.copy(sourceRect);
-    tmp = tmp.convertToFormat(QImage::Format_ARGB32_Premultiplied);
     tmp = tmp.scaled(
               destRect.width(),
               destRect.height(),
diff -Nru gwenview-15.04.2/lib/slidecontainer.h gwenview-15.07.90/lib/slidecontainer.h
--- gwenview-15.04.2/lib/slidecontainer.h	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/slidecontainer.h	2015-08-05 19:47:32.000000000 +0000
@@ -22,6 +22,7 @@
 
 // Qt
 #include <QWeakPointer>
+#include <QPointer>
 #include <QFrame>
 
 #include <lib/gwenviewlib_export.h>
@@ -86,7 +87,7 @@
     void slotAnimFinished();
 
 private:
-    QWidget* mContent;
+    QPointer<QWidget> mContent;
     QWeakPointer<QPropertyAnimation> mAnim;
     bool mSlidingOut;
 
diff -Nru gwenview-15.04.2/lib/thumbnailprovider/thumbnailwriter.cpp gwenview-15.07.90/lib/thumbnailprovider/thumbnailwriter.cpp
--- gwenview-15.04.2/lib/thumbnailprovider/thumbnailwriter.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/thumbnailprovider/thumbnailwriter.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -46,7 +46,7 @@
 static void storeThumbnailToDiskCache(const QString& path, const QImage& image)
 {
     LOG(path);
-    QTemporaryFile tmp(path + QStringLiteral("/.gwenview.tmpXXXXXX.png"));
+    QTemporaryFile tmp(path + QStringLiteral(".gwenview.tmpXXXXXX.png"));
     if (!tmp.open()) {
         qWarning() << "Could not create a temporary file.";
         return;
diff -Nru gwenview-15.04.2/lib/thumbnailview/thumbnailview.cpp gwenview-15.07.90/lib/thumbnailview/thumbnailview.cpp
--- gwenview-15.04.2/lib/thumbnailview/thumbnailview.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/thumbnailview/thumbnailview.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -189,7 +189,7 @@
 
     void setupBusyAnimation()
     {
-        mBusySequence = KPixmapSequence("process-working", 22);
+        mBusySequence = KIconLoader::global()->loadPixmapSequence(QStringLiteral("process-working"), 22);
         mBusyAnimationTimeLine = new QTimeLine(100 * mBusySequence.frameCount(), q);
         mBusyAnimationTimeLine->setCurveShape(QTimeLine::LinearCurve);
         mBusyAnimationTimeLine->setEndFrame(mBusySequence.frameCount() - 1);
diff -Nru gwenview-15.04.2/lib/timeutils.cpp gwenview-15.07.90/lib/timeutils.cpp
--- gwenview-15.04.2/lib/timeutils.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/timeutils.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -117,7 +117,7 @@
             stream << *it;
             QString value = QString::fromLocal8Bit(stream.str().c_str());
 
-            QDateTime dt = QDateTime::fromString(value, "%Y:%m:%d %H:%M:%S");
+            QDateTime dt = QDateTime::fromString(value, "yyyy:MM:dd hh:mm:ss");
             if (!dt.isValid()) {
                 qWarning() << "Invalid date in exif header of" << path;
                 return false;
diff -Nru gwenview-15.04.2/lib/version.h gwenview-15.07.90/lib/version.h
--- gwenview-15.04.2/lib/version.h	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/lib/version.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-// vim: set tabstop=4 shiftwidth=4 expandtab:
-/*
-Gwenview: an image viewer
-Copyright 2010-2013 Aurélien Gâteau <agateau@kde.org>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
-
-*/
-#ifndef VERSION_H
-#define VERSION_H
-
-/*
-
-For stable releases, GWENVIEW_VERSION should be "$major.$minor.$patch",
-matching KDE SC versions.
-
-For unstable releases, it should be "$major.$minor.$patch $suffix", where
-suffix is one of "pre", "alpha$N", "beta$N" or "rc$N".
-
-When you change GWENVIEW_VERSION, add the new version in Bugzilla as well:
-https://bugs.kde.org/editversions.cgi?product=gwenview
-
-*/
-#define GWENVIEW_VERSION "5.0.0"
-
-#endif /* VERSION_H */
diff -Nru gwenview-15.04.2/part/CMakeLists.txt gwenview-15.07.90/part/CMakeLists.txt
--- gwenview-15.04.2/part/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/part/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -12,7 +12,7 @@
 
 target_link_libraries(gvpart KF5::Parts gwenviewlib)
 
-install(TARGETS gvpart DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES gvpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(TARGETS gvpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(FILES gvpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 install(FILES gvpart.rc
-    DESTINATION ${DATA_INSTALL_DIR}/gvpart)
+    DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/gvpart)
diff -Nru gwenview-15.04.2/tests/auto/CMakeLists.txt gwenview-15.07.90/tests/auto/CMakeLists.txt
--- gwenview-15.04.2/tests/auto/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -1,15 +1,9 @@
 include(ECMAddTests)
 
-find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
-
-if(NOT Qt5Test_FOUND)
-    message(STATUS "Qt5Test not found, autotests will not be built.")
-    return()
-endif()
-
 macro(gv_add_unit_test _test)
     set(_src ${_test}.cpp ${ARGN})
     add_executable(${_test} ${_src})
+    add_test( ${_test} ${_test} )
     ecm_mark_as_test(${_test})
     target_link_libraries(${_test}
         KF5::KDELibs4Support
@@ -20,6 +14,7 @@
 include_directories(
     ${gwenview_SOURCE_DIR}
     ${importer_SOURCE_DIR}
+    ${EXIV2_INCLUDE_DIR}
     )
 
 # For config-gwenview.h
diff -Nru gwenview-15.04.2/tests/auto/historymodeltest.cpp gwenview-15.07.90/tests/auto/historymodeltest.cpp
--- gwenview-15.04.2/tests/auto/historymodeltest.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/historymodeltest.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -25,7 +25,7 @@
 // KDE
 #include <QDebug>
 #include <KFilePlacesModel>
-#include <KTempDir>
+#include <QTemporaryDir>
 #include <qtest.h>
 
 // Local
@@ -59,15 +59,15 @@
     QDateTime d1 = QDateTime::fromString("2008-02-03T12:34:56", Qt::ISODate);
     QUrl u2 = QUrl::fromLocalFile("/root");
     QDateTime d2 = QDateTime::fromString("2009-01-29T23:01:47", Qt::ISODate);
-    KTempDir dir;
+    QTemporaryDir dir;
     {
-        HistoryModel model(0, dir.name());
+        HistoryModel model(0, dir.path());
         model.addUrl(u1, d1);
         model.addUrl(u2, d2);
         testModel(model, u2, u1);
     }
 
-    HistoryModel model(0, dir.name());
+    HistoryModel model(0, dir.path());
     testModel(model, u2, u1);
 
     // Make u1 the most recent
@@ -85,9 +85,9 @@
     QUrl u3 = QUrl::fromLocalFile("/usr");
     QDateTime d3 = QDateTime::fromString("2009-03-24T22:42:15", Qt::ISODate);
 
-    KTempDir dir;
+    QTemporaryDir dir;
     {
-        HistoryModel model(0, dir.name(), 2);
+        HistoryModel model(0, dir.path(), 2);
         model.addUrl(u1, d1);
         model.addUrl(u2, d2);
         testModel(model, u2, u1);
@@ -97,7 +97,7 @@
     // Create a model with a larger history so that if garbage collecting fails
     // to remove the collected url, the size of the model won't pass
     // testModel()
-    HistoryModel model(0, dir.name(), 10);
+    HistoryModel model(0, dir.path(), 10);
     testModel(model, u3, u2);
 }
 
@@ -108,12 +108,12 @@
     QUrl u2 = QUrl::fromLocalFile("/root");
     QDateTime d2 = QDateTime::fromString("2009-01-29T23:01:47", Qt::ISODate);
 
-    KTempDir dir;
-    HistoryModel model(0, dir.name(), 2);
+    QTemporaryDir dir;
+    HistoryModel model(0, dir.path(), 2);
     model.addUrl(u1, d1);
     model.addUrl(u2, d2);
     model.removeRows(0, 1);
     QCOMPARE(model.rowCount(), 1);
-    QDir qDir(dir.name());
+    QDir qDir(dir.path());
     QCOMPARE(qDir.entryList(QDir::Files | QDir::NoDotAndDotDot).count(), 1);
 }
diff -Nru gwenview-15.04.2/tests/auto/importertest.cpp gwenview-15.07.90/tests/auto/importertest.cpp
--- gwenview-15.04.2/tests/auto/importertest.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/importertest.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -48,7 +48,7 @@
                     << urlForTestFile("import/pict0003.jpg")
                     ;
 
-    mTempDir.reset(new KTempDir());
+    mTempDir.reset(new QTemporaryDir());
 }
 
 void ImporterTest::testContentsAreIdentical()
diff -Nru gwenview-15.04.2/tests/auto/importertest.h gwenview-15.07.90/tests/auto/importertest.h
--- gwenview-15.04.2/tests/auto/importertest.h	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/importertest.h	2015-08-05 19:47:32.000000000 +0000
@@ -27,7 +27,7 @@
 #include <QObject>
 
 // KDE
-#include <KTempDir>
+#include <QTemporaryDir>
 #include <QUrl>
 
 class ImporterTest : public QObject
@@ -46,7 +46,7 @@
     void testRenamedCount();
 
 private:
-    std::auto_ptr<KTempDir> mTempDir;
+    std::auto_ptr<QTemporaryDir> mTempDir;
     QUrl::List mDocumentList;
 };
 
diff -Nru gwenview-15.04.2/tests/auto/placetreemodeltest.cpp gwenview-15.07.90/tests/auto/placetreemodeltest.cpp
--- gwenview-15.04.2/tests/auto/placetreemodeltest.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/placetreemodeltest.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -26,6 +26,7 @@
 // KDE
 #include <QDebug>
 #include <KStandardDirs>
+#include <QStandardPaths>
 #include <qtest.h>
 
 // Local
@@ -70,8 +71,8 @@
 
 void PlaceTreeModelTest::initTestCase()
 {
-    Q_ASSERT(mTempDir.exists());
-    QDir dir(mTempDir.name());
+    Q_ASSERT(mTempDir.isValid());
+    QDir dir(mTempDir.path());
 
     const bool dir1created = dir.mkdir("url1");
     Q_ASSERT(dir1created);
@@ -96,16 +97,20 @@
 
 void PlaceTreeModelTest::init()
 {
+    QStandardPaths::setTestModeEnabled(true);
+
     TestUtils::purgeUserConfiguration();
 
-    QFile bookmark(KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml"));
+    const QString confDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+    QDir().mkpath(confDir);
+    QFile bookmark(confDir + "/user-places.xbel");
     const bool bookmarkOpened = bookmark.open(QIODevice::WriteOnly);
     Q_ASSERT(bookmarkOpened);
     Q_UNUSED(bookmarkOpened);
 
     QString xml = QString(BOOKMARKS_XML)
-                  .arg(mUrl1.toLocalFile())
-                  .arg(mUrl2.toLocalFile())
+                  .arg(mUrl1.url())
+                  .arg(mUrl2.url())
                   ;
     bookmark.write(xml.toUtf8());
 
diff -Nru gwenview-15.04.2/tests/auto/placetreemodeltest.h gwenview-15.07.90/tests/auto/placetreemodeltest.h
--- gwenview-15.04.2/tests/auto/placetreemodeltest.h	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/placetreemodeltest.h	2015-08-05 19:47:32.000000000 +0000
@@ -25,7 +25,7 @@
 #include <QStringList>
 
 // KDE
-#include <KTempDir>
+#include <QTemporaryDir>
 #include <QUrl>
 
 class PlaceTreeModelTest : public QObject
@@ -41,7 +41,7 @@
 private:
     QUrl mUrl1, mUrl2;
     QStringList mUrl1Dirs;
-    KTempDir mTempDir;
+    QTemporaryDir mTempDir;
 };
 
 #endif /* PLACETREEMODELTEST_H */
diff -Nru gwenview-15.04.2/tests/auto/recursivedirmodeltest.cpp gwenview-15.07.90/tests/auto/recursivedirmodeltest.cpp
--- gwenview-15.04.2/tests/auto/recursivedirmodeltest.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/recursivedirmodeltest.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -103,8 +103,7 @@
 {
     QList<QUrl> lst;
     Q_FOREACH(const QString &name, files) {
-        QUrl url(dir.absoluteFilePath(name));
-        lst << url;
+        lst << QUrl::fromLocalFile(dir.absoluteFilePath(name));
     }
     qSort(lst);
     return lst;
@@ -130,19 +129,24 @@
 
     // Test initial files
     sandBoxDir.fill(initialFiles);
-    model.setUrl(sandBoxDir.absolutePath());
-    loop.exec();
+    model.setUrl(QUrl::fromLocalFile(sandBoxDir.absolutePath()));
 
-    QList<QUrl> out = listModelUrls(&model);
-    QList<QUrl> expected = listExpectedUrls(sandBoxDir, initialFiles);
+    QList<QUrl> out, expected;
+    do {
+        loop.exec();
+        out = listModelUrls(&model);
+        expected = listExpectedUrls(sandBoxDir, initialFiles);
+    } while (out.size() != expected.size());
     QCOMPARE(out, expected);
 
     // Test adding new files
     sandBoxDir.fill(addedFiles);
-    loop.exec();
 
-    out = listModelUrls(&model);
-    expected = listExpectedUrls(sandBoxDir, initialFiles + addedFiles);
+    do {
+        loop.exec();
+        out = listModelUrls(&model);
+        expected = listExpectedUrls(sandBoxDir, initialFiles + addedFiles);
+    } while (out.size() != expected.size());
     QCOMPARE(out, expected);
 
 # if 0
@@ -191,11 +195,11 @@
     TestUtils::TimedEventLoop loop;
     connect(&model, SIGNAL(completed()), &loop, SLOT(quit()));
 
-    model.setUrl(sandBoxDir.absoluteFilePath("d1"));
+    model.setUrl(QUrl::fromLocalFile(sandBoxDir.absoluteFilePath("d1")));
     loop.exec();
     QCOMPARE(model.rowCount(QModelIndex()), 4);
 
-    model.setUrl(sandBoxDir.absoluteFilePath("d2"));
+    model.setUrl(QUrl::fromLocalFile(sandBoxDir.absoluteFilePath("d2")));
     loop.exec();
     QCOMPARE(model.rowCount(QModelIndex()), 2);
 }
diff -Nru gwenview-15.04.2/tests/auto/sorteddirmodeltest.cpp gwenview-15.07.90/tests/auto/sorteddirmodeltest.cpp
--- gwenview-15.04.2/tests/auto/sorteddirmodeltest.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/sorteddirmodeltest.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -30,7 +30,7 @@
 // KDE
 #include <qtest.h>
 #include <KDirLister>
-#include <KTempDir>
+#include <QTemporaryDir>
 
 using namespace Gwenview;
 
diff -Nru gwenview-15.04.2/tests/auto/testutils.cpp gwenview-15.07.90/tests/auto/testutils.cpp
--- gwenview-15.04.2/tests/auto/testutils.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/testutils.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -27,6 +27,7 @@
 #include <KDebug>
 #include <KIO/NetAccess>
 #include <KStandardDirs>
+#include <QStandardPaths>
 
 QUrl setUpRemoteTestDir(const QString& testFile)
 {
@@ -86,8 +87,8 @@
 
 void purgeUserConfiguration()
 {
-    QString confDir = qgetenv("KDEHOME");
-    QVERIFY(confDir.endsWith(".kde-unit-test")); // Better safe than sorry
+    QString confDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+    QVERIFY(confDir.endsWith(".qttest/share")); // Better safe than sorry
     if (QFileInfo(confDir).isDir()) {
         bool ok = KIO::NetAccess::del(QUrl::fromLocalFile(confDir), 0);
         QVERIFY(ok);
@@ -161,7 +162,7 @@
 SandBoxDir::SandBoxDir()
 : mTempDir(QDir::currentPath() + "/sandbox-")
 {
-    setPath(mTempDir.name());
+    setPath(mTempDir.path());
 }
 
 void SandBoxDir::fill(const QStringList& filePaths)
diff -Nru gwenview-15.04.2/tests/auto/testutils.h gwenview-15.07.90/tests/auto/testutils.h
--- gwenview-15.04.2/tests/auto/testutils.h	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/testutils.h	2015-08-05 19:47:32.000000000 +0000
@@ -30,7 +30,7 @@
 
 // KDE
 #include <QDebug>
-#include <KTempDir>
+#include <QTemporaryDir>
 #include <QUrl>
 
 #include "config-gwenview.h"
@@ -102,7 +102,7 @@
     void fill(const QStringList& files);
 
 private:
-    KTempDir mTempDir;
+    QTemporaryDir mTempDir;
 };
 
 /**
diff -Nru gwenview-15.04.2/tests/auto/timeutilstest.cpp gwenview-15.07.90/tests/auto/timeutilstest.cpp
--- gwenview-15.04.2/tests/auto/timeutilstest.cpp	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/auto/timeutilstest.cpp	2015-08-05 19:47:32.000000000 +0000
@@ -25,7 +25,7 @@
 
 // KDE
 #include <KFileItem>
-#include <KTemporaryFile>
+#include <QTemporaryFile>
 #include <qtest.h>
 
 // Local
@@ -48,8 +48,8 @@
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<QDateTime>("expectedDateTime");
 
-    NEW_ROW("date/exif-datetimeoriginal.jpg", QDateTime::fromString("2003-03-10T17:45:21"));
-    NEW_ROW("date/exif-datetime-only.jpg", QDateTime::fromString("2003-03-25T02:02:21"));
+    NEW_ROW("date/exif-datetimeoriginal.jpg", QDateTime::fromString("2003-03-10T17:45:21", Qt::ISODate));
+    NEW_ROW("date/exif-datetime-only.jpg", QDateTime::fromString("2003-03-25T02:02:21", Qt::ISODate));
 
     QUrl url = urlForTestFile("test.png");
     KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
@@ -73,7 +73,7 @@
 
 void TimeUtilsTest::testCache()
 {
-    KTemporaryFile tempFile;
+    QTemporaryFile tempFile;
     QVERIFY(tempFile.open());
     QUrl url = QUrl::fromLocalFile(tempFile.fileName());
     KFileItem item1(KFileItem::Unknown, KFileItem::Unknown, url);
diff -Nru gwenview-15.04.2/tests/CMakeLists.txt gwenview-15.07.90/tests/CMakeLists.txt
--- gwenview-15.04.2/tests/CMakeLists.txt	2015-05-28 22:56:18.000000000 +0000
+++ gwenview-15.07.90/tests/CMakeLists.txt	2015-08-05 19:47:32.000000000 +0000
@@ -1,3 +1,10 @@
+find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
+
+if(NOT Qt5Test_FOUND)
+    message(STATUS "Qt5Test not found, tests will not be built.")
+    return()
+endif()
+
 add_subdirectory(auto)
 add_subdirectory(manual)