[Kde-bindings] KDE/kdebindings/smoke/qt

[Richard Dale]

SVN commit 723410 by rdale:

* Skip defines that begin 'QT_EDITION..' when doing the config tests for the Qt features
* Reenable the grab_qglobal_symbols() tests

CCMAIL: kde-bindings at kde.org
CCMAIL: germain at ebooksfrance.org

 M  +5 -5      qtguess.pl.cmake  


--- trunk/KDE/kdebindings/smoke/qt/qtguess.pl.cmake #723409:723410
@@ -56,7 +56,7 @@
 print "Number of defines to be tested : $used/$total\n\n" unless $opt_q;
 open( QTDEFS, ">>".($opt_o || "qtdefines") ) or die "Can't open output file: $!\n";
 
-# grab_qglobal_symbols();
+grab_qglobal_symbols();
 preliminary_test();
 perform_all_tests();
 
@@ -70,13 +70,11 @@
 sub grab_qglobal_symbols
 {
 	my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc -I$qtcoreinc $qtcoreinc/qglobal.h 2>/dev/null";
-print("cmd: '$cmd'\n");
 	my $symbols = `$cmd`;
         for(0..1)
         {
 	    if( check_exit_status($?) )
 	    {
-print("In grab_qglobal_symbols()\n");
 		while( $symbols =~/^#\s*define\s*(QT_\S+)/gm )
 		{
 			$qtdefs{$1} = 1;
@@ -92,7 +90,7 @@
 	    elsif(! $_) # first try
 	    {
 		print  "Failed to run $cmd.\nTrying without __cplusplus (might be already defined)\n";
-                $cmd = "$cc -E -dM -I$qtinc/QtCore $qtinc/QtCore/qglobal.h 2>/dev/null";
+                $cmd = "$cc -E -dM -I$qtinc -I$qtcoreinc $qtcoreinc/qglobal.h 2>/dev/null";
                 $symbols = `$cmd`;
                 next;
 	    }
@@ -166,7 +164,9 @@
 		open( OUT, ">${tmp}.cpp" ) or die "Failed to open temp file ${tmp}.cpp: $!\n";
 		foreach $def(keys %qtdefs)
 		{
-			print OUT "#define $def\n";
+			if ( $def !~ /QT_EDITION/ ) {
+				print OUT "#define $def\n";
+			}
 		}
 		foreach $inc(split /,\s*/, $tests{$_}->[0])
 		{