diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16dd89e..d5ec376 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,6 +83,7 @@ add_definitions(
   -DQT_NO_SIGNALS_SLOTS_KEYWORDS
   -DQT_USE_FAST_OPERATOR_PLUS
   -DQT_DISABLE_DEPRECATED_BEFORE=0x050900
+  -DQ_NO_KEYWORDS
 )
 
 find_package(KPMcore ${KPMCORE_MIN_VERSION} REQUIRED)
diff --git a/src/config/configureoptionsdialog.cpp b/src/config/configureoptionsdialog.cpp
index 6c31f74..fa98d72 100644
--- a/src/config/configureoptionsdialog.cpp
+++ b/src/config/configureoptionsdialog.cpp
@@ -96,7 +96,7 @@ void ConfigureOptionsDialog::updateSettings()
     }
 
     if (changed)
-        emit KConfigDialog::settingsChanged(i18n("General Settings"));
+        Q_EMIT KConfigDialog::settingsChanged(i18n("General Settings"));
 }
 
 bool ConfigureOptionsDialog::hasChanged()
diff --git a/src/gui/listdevices.cpp b/src/gui/listdevices.cpp
index a2ed8c4..600868d 100644
--- a/src/gui/listdevices.cpp
+++ b/src/gui/listdevices.cpp
@@ -63,7 +63,7 @@ void ListDevices::on_m_ListDevices_itemSelectionChanged()
         ListDeviceWidgetItem* item = dynamic_cast<ListDeviceWidgetItem*>(listDevices().selectedItems()[0]);
 
         if (item != nullptr)
-            emit selectionChanged(item->deviceNode);
+            Q_EMIT selectionChanged(item->deviceNode);
     }
 }
 
@@ -72,7 +72,7 @@ void ListDevices::on_m_ListDevices_itemDoubleClicked(QListWidgetItem* list_item)
     ListDeviceWidgetItem* item = dynamic_cast<ListDeviceWidgetItem*>(list_item);
 
     if (item != nullptr)
-        emit deviceDoubleClicked(item->deviceNode);
+        Q_EMIT deviceDoubleClicked(item->deviceNode);
 }
 
 bool ListDevices::setSelectedDevice(const QString& device_node)
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index c20465a..a721271 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -1192,7 +1192,7 @@ void MainWindow::onSettingsChanged()
 
     PartitionAlignment::setSectorAlignment(Config::sectorAlignment());
 
-    emit settingsChanged();
+    Q_EMIT settingsChanged();
 }
 
 void MainWindow::onConfigureOptions()
diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp
index dbf0135..d23b046 100644
--- a/src/gui/partitionmanagerwidget.cpp
+++ b/src/gui/partitionmanagerwidget.cpp
@@ -166,7 +166,7 @@ void PartitionManagerWidget::setSelectedPartition(const Partition* p)
 {
     if (p == nullptr) {
         treePartitions().setCurrentItem(nullptr);
-        emit selectedPartitionChanged(nullptr);
+        Q_EMIT selectedPartitionChanged(nullptr);
         updatePartitions();
     } else
         partTableWidget().setActivePartition(p);
@@ -299,10 +299,10 @@ void PartitionManagerWidget::on_m_TreePartitions_itemDoubleClicked(QTreeWidgetIt
 {
     if (item == treePartitions().topLevelItem(0)) {
         if (selectedDevice() != nullptr)
-            emit deviceDoubleClicked(selectedDevice());
+            Q_EMIT deviceDoubleClicked(selectedDevice());
     } else {
         if (selectedPartition() != nullptr)
-            emit partitionDoubleClicked(selectedPartition());
+            Q_EMIT partitionDoubleClicked(selectedPartition());
     }
 }
 
@@ -315,7 +315,7 @@ void PartitionManagerWidget::on_m_PartTableWidget_itemSelectionChanged(PartWidge
 {
     if (item == nullptr) {
         treePartitions().setCurrentItem(nullptr);
-        emit selectedPartitionChanged(nullptr);
+        Q_EMIT selectedPartitionChanged(nullptr);
         return;
     }
 
@@ -336,23 +336,23 @@ void PartitionManagerWidget::on_m_PartTableWidget_itemSelectionChanged(PartWidge
         }
     }
 
-    emit selectedPartitionChanged(p);
+    Q_EMIT selectedPartitionChanged(p);
 }
 
 void PartitionManagerWidget::on_m_PartTableWidget_customContextMenuRequested(const QPoint& pos)
 {
-    emit contextMenuRequested(partTableWidget().mapToGlobal(pos));
+    Q_EMIT contextMenuRequested(partTableWidget().mapToGlobal(pos));
 }
 
 void PartitionManagerWidget::on_m_PartTableWidget_itemDoubleClicked()
 {
     if (selectedPartition())
-        emit partitionDoubleClicked(selectedPartition());
+        Q_EMIT partitionDoubleClicked(selectedPartition());
 }
 
 void PartitionManagerWidget::on_m_TreePartitions_customContextMenuRequested(const QPoint& pos)
 {
-    emit contextMenuRequested(treePartitions().viewport()->mapToGlobal(pos));
+    Q_EMIT contextMenuRequested(treePartitions().viewport()->mapToGlobal(pos));
 }
 
 void PartitionManagerWidget::onPropertiesPartition()
diff --git a/src/gui/parttablewidget.cpp b/src/gui/parttablewidget.cpp
index e5e9eeb..83dcc92 100644
--- a/src/gui/parttablewidget.cpp
+++ b/src/gui/parttablewidget.cpp
@@ -103,7 +103,7 @@ void PartTableWidget::setActiveWidget(PartWidget* p)
     if (p != nullptr)
         p->setActive(true);
 
-    emit itemSelectionChanged(p);
+    Q_EMIT itemSelectionChanged(p);
 
     update();
 }
@@ -175,5 +175,5 @@ void PartTableWidget::mouseDoubleClickEvent(QMouseEvent* event)
     const PartWidget* child = static_cast<PartWidget*>(childAt(event->pos()));
 
     if (child != nullptr)
-        emit itemDoubleClicked(child);
+        Q_EMIT itemDoubleClicked(child);
 }