(c-forward-label): Fix for QT macros.

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 4305238640897086ed9a76f2d2fbce8f24c55844..c45913e18278be6f4f4ff4f3388b0aa9d8408420 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -5954,7 +5954,8 @@ comment at the start of cc-engine.el for more info."
        label-end
        qt-symbol-idx
        macro-start                     ; if we're in one.
-       label-type)
+       label-type
+       kwd)
     (cond
      ;; "case" or "default" (Doesn't apply to AWK).
      ((looking-at c-label-kwds-regexp)
@@ -6107,12 +6108,13 @@ comment at the start of cc-engine.el for more info."
                ((looking-at ":\\([^:]\\|\\'\\)") ; A single colon.
                 (forward-char)
                 (setq label-type
-                      (if (string= "signals" ; Special QT macro
-                                   (buffer-substring-no-properties start label-end))
+                      (if (or (string= "signals" ; Special QT macro
+                                       (setq kwd (buffer-substring-no-properties start label-end)))
+                              (string= "Q_SIGNALS" kwd))
                           'qt-1kwd-colon
                         'goto-target)))
                ((and qt-symbol-idx
-                     (search-forward-regexp "\\=slots\\>" limit t)
+                     (search-forward-regexp "\\=\\(slots\\|Q_SLOTS\\)\\>" limit t)
                      (progn (c-forward-syntactic-ws limit)
                             (looking-at ":\\([^:]\\|\\'\\)"))) ; A single colon
                 (forward-char)