diff --git a/NEWS b/NEWS
index c88007d..1c401d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+1.2.6
+-----
+* FIXED: Could not compile with Qt 5.10.
+
+1.2.5
+-----
+* FIXED: Did not always install translations in Linux.
+
1.2.4
-----
* FIXED: Definitions were not being downloaded.
diff --git a/connectagram.pro b/connectagram.pro
index 9b14cd1..50c4525 100644
--- a/connectagram.pro
+++ b/connectagram.pro
@@ -1,10 +1,17 @@
-lessThan(QT_VERSION, 5.2) {
+lessThan(QT_MAJOR_VERSION, 5) {
+ error("Connectagram requires Qt 5.2 or greater")
+}
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
error("Connectagram requires Qt 5.2 or greater")
}
TEMPLATE = app
QT += network widgets
CONFIG += warn_on c++11
+
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051000
+DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT
# Allow in-tree builds
!win32 {
@@ -14,7 +21,7 @@
}
# Set program version
-VERSION = 1.2.4
+VERSION = 1.2.6
DEFINES += VERSIONSTR=\\\"$${VERSION}\\\"
# Set program name
@@ -101,9 +108,9 @@
desktop.path = $$PREFIX/share/applications/
appdata.files = icons/connectagram.appdata.xml
- appdata.path = $$PREFIX/share/appdata/
+ appdata.path = $$PREFIX/share/metainfo/
- qm.files = translations/*.qm
+ qm.files = $$replace(TRANSLATIONS, .ts, .qm)
qm.path = $$PREFIX/share/connectagram/translations
qm.CONFIG += no_check_exist
diff --git a/mac_deploy.sh b/mac_deploy.sh
index c18f4fd..71bd91d 100755
--- a/mac_deploy.sh
+++ b/mac_deploy.sh
@@ -2,7 +2,7 @@
APP='Connectagram'
BUNDLE="$APP.app"
-VERSION='1.2.4'
+VERSION='1.2.6'
# Remove any previous disk folder or DMG
echo -n 'Preparing... '
diff --git a/src/window.cpp b/src/window.cpp
index 9fa05be..c27510b 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009, 2012, 2013, 2014, 2015, 2016 Graeme Gott
%3
%4
%5