diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3c7a2711..48510b325 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,8 +78,7 @@ install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDI
 install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/symbolic/apps)
 install(FILES neochat.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
 
-# add_definitions(-DQT_NO_KEYWORDS) Need to fix libQuotient first
-add_definitions(-DQT_NO_FOREACH)
+add_definitions(-DQT_NO_FOREACH -DQT_NO_KEYWORDS)
 
 add_subdirectory(src)
 
diff --git a/src/neochatuser.cpp b/src/neochatuser.cpp
index 90f1b5ec3..afed0fa43 100644
--- a/src/neochatuser.cpp
+++ b/src/neochatuser.cpp
@@ -31,7 +31,7 @@ void NeoChatUser::setColor(const QColor &color)
     }
 
     m_color = color;
-    emit colorChanged(m_color);
+    Q_EMIT colorChanged(m_color);
 }
 
 void NeoChatUser::polishColor()