summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-05-04 08:20:19 +0200
committerMontel Laurent <[email protected]>2017-05-04 08:20:19 +0200
commitea174ddccc9d939ed9081f8ded98473102f01dab (patch)
tree545537319fa28341cea305ab96909cf54d4f1353
parentb9041e7c7607bc483ea4a5fc1b3c054943d6d007 (diff)
Remove this deprecated method
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/filter/filteractions/filteractionwithcommand.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db3d3e7..2ae328d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,8 @@ add_definitions( -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT )
add_definitions("-DQT_NO_CAST_TO_ASCII")
remove_definitions( -DQT_NO_CAST_FROM_BYTEARRAY )
remove_definitions( -DQT_NO_CAST_FROM_ASCII )
+#add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 )
+
########### CMake Config Files ###########
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailCommon")
diff --git a/src/filter/filteractions/filteractionwithcommand.cpp b/src/filter/filteractions/filteractionwithcommand.cpp
index 2094a54..ac0038c 100644
--- a/src/filter/filteractions/filteractionwithcommand.cpp
+++ b/src/filter/filteractions/filteractionwithcommand.cpp
@@ -87,7 +87,7 @@ QString FilterActionWithCommand::substituteCommandLineArgsFor(const KMime::Messa
}
// sort the list of n's
- qSort(argList);
+ std::sort(argList.begin(), argList.end());
// and use QString::arg to substitute filenames for the %n's.
int lastSeen = -2;