- Move setting _U_ into config.h, because

  a) C++ has a standardized way of marking parameters as unused
  b) cmakes autoquoting magic failed when the compiler wasn't gcc
     but moc instead.
- qtshark: Don't try to compile the c source files inside ui/qt/
- qtshark: Only run moc on the files that need it.
- qtshark: It's too early to try any of the new qtshark files
  as clean.
- Make Qt detection actually work
- Add C++ to the list of languages for this project

svn path=/trunk/; revision=40807

1 files changed, 7 insertions, 0 deletions

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 2a4e1ab644..8578ef05be 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -368,3 +368,10 @@
    `char[]'. */
 /* Note: not use in the code */
 #cmakedefine YYTEXT_POINTER
+
+/* _U_ isn't needed for C++, simply don't name the variable.
+   Also, running moc with -D_U_... breaks cmake's auto escaping magic. */
+#ifndef __cplusplus
+# define _U_ ${C_UNUSED}
+#endif
+