diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index 4dd966ebc..8ecf55f12 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -443,7 +443,7 @@ void Helpers::populateFileComboBox(QComboBox * b, const QSet<QString> & set, con
   bool added = false;
   // Convert set into list and sort it alphabetically case insensitive
   QStringList list = QStringList::fromSet(set);
-  qSort(list.begin(), list.end(), caseInsensitiveLessThan);
+  std::sort(list.begin(), list.end(), caseInsensitiveLessThan);
   foreach (QString entry, list) {
     b->addItem(entry);
     if (entry == current) {
diff --git a/companion/src/logsdialog.cpp b/companion/src/logsdialog.cpp
index ed28245ba..e60318c69 100644
--- a/companion/src/logsdialog.cpp
+++ b/companion/src/logsdialog.cpp
@@ -830,7 +830,7 @@ void LogsDialog::plotLogs()
     foreach (QModelIndex index, selection) {
       selectedRows.append(index.row());
     }
-    qSort(selectedRows.begin(), selectedRows.end());
+    std::sort(selectedRows.begin(), selectedRows.end());
   } else {
     hasLogSelection = false;
     rowCount = ui->logTable->rowCount();
diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
index cbdefb581..27ca4c42f 100644
--- a/companion/src/modeledit/inputs.cpp
+++ b/companion/src/modeledit/inputs.cpp
@@ -483,7 +483,7 @@ void InputsPanel::expolistWidget_doubleClicked(QModelIndex index)
 
 void InputsPanel::exposDeleteList(QList<int> list, bool clearName)
 {
-    qSort(list.begin(), list.end());
+    std::sort(list.begin(), list.end());
 
     int iDec = 0;
     foreach(int idx, list) {
diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp
index f5d76d32f..c92105ec6 100644
--- a/companion/src/modeledit/mixes.cpp
+++ b/companion/src/modeledit/mixes.cpp
@@ -222,7 +222,7 @@ void MixesPanel::mixerlistWidget_doubleClicked(QModelIndex index)
 
 void MixesPanel::mixersDeleteList(QList<int> list)
 {
-  qSort(list.begin(), list.end());
+  std::sort(list.begin(), list.end());
 
   int iDec = 0;
   foreach(int idx, list) {