Fix kalyptus/tqt

(cherry picked from commit 2ef253fb5a)

kalyptus/kalyptus

@@ -860,6 +860,7 @@ sub identifyDecl
 	elsif ( $decl =~ /^\s*((?:template\s*<.*>)?)      # 1 template
 					\s*(class|struct|union|namespace) # 2 struct type
 					(?:\s*TQ[A-Z_]*EXPORT[A-Z_]*)?
+					(?:\s*Q[A-Z_]*EXPORT[A-Z_]*)?
 					(?:\s*Q_PACKED)?
 					(?:\s*Q_REFCOUNT)?
 					\s+([\w_]+                        # 3 name
@@ -1093,6 +1094,10 @@ sub identifyDecl
 	elsif ( $decl =~ /(template|friend)\s+class\s+(?:TQ[A-Z_]*EXPORT[A-Z_]*\s*)?\w+\s*<.*>\s*;/x ) {
 		# Nothing to be done with those.
 	}
+	# explicit template instantiation, or friend template
+	elsif ( $decl =~ /(template|friend)\s+class\s+(?:Q[A-Z_]*EXPORT[A-Z_]*\s*)?\w+\s*<.*>\s*;/x ) {
+		# Nothing to be done with those (same as above, but for QT not TQT).
+	}
 	else {
 
 		## decl is unidentified.
@@ -1601,6 +1606,7 @@ sub newMethod
 	}
 
 	$retType =~ s/TQM?_EXPORT[_A-Z]*\s*//;
+	$retType =~ s/QM?_EXPORT[_A-Z]*\s*//;
 	$retType =~ s/inline\s+//;
 	$retType =~ s/extern\s+//;
 	$retType =~ s/^\s*//g;