unify QT

afabri · Dec 27, 2023 · 3564fd1 · 3564fd1
1 parent ea07530
commit 3564fd1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/Maintenance/test_handling/create_testresult_page b/Maintenance/test_handling/create_testresult_page
@@ -474,8 +474,7 @@ sub print_platform_descriptions()
 <th>BOOST</th>
 <th>MPFR</th>
 <th>GMP</th>
-<th>QT5</th>
-<th>QT6</th>
+<th>QT</th>
 <th>LEDA</th>
 <th>CXXFLAGS</th>
 <th>LDFLAGS</th>
@@ -512,7 +511,7 @@ EOF
 	    my $countn = $testresults[$platform_num]->{"n"};
 	    my $countr = $testresults[$platform_num]->{"r"};
 
-	    my $index = 9;
+	    my $index = 8;
 	    my @tmp;
 	    while ($index) {
 	        $index--;
@@ -531,7 +530,7 @@ EOF
 	    print OUTPUT "<td>$counto</td>\n";
  	    print OUTPUT "<td>$countn</td>\n";
  	    print OUTPUT "<td>$countr</td>\n";
-	    $index = 9;
+	    $index = 8;
 	    while ($index) {
 	        $index--;
 		$_ = $tmp[$index];
@@ -543,7 +542,7 @@ EOF
 	    }
 	} else {
             print OUTPUT ">$pf_short</a>";
-	    my $index = 13;
+	    my $index = 12;
 	    while ($index) {
         $index--;
 		print OUTPUT "<td>?</td>\n";

diff --git a/Maintenance/test_handling/to_zipped_format b/Maintenance/test_handling/to_zipped_format
@@ -51,7 +51,7 @@ sub reformat_results($)
     $_ = $line;
     open (PLATFORM_INFO,">${platform}.info") or return;
     open (PLATFORM_NEW_RESULTS,">${platform}.new_results") or return;
-    my ($CGAL_VERSION,$LEDA_VERSION,$COMPILER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$QT4,$QT5,$QT6,$CMAKE) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","-","-","-","no");
+    my ($CGAL_VERSION,$LEDA_VERSION,$COMPILER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$CMAKE) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","no");
     my ($LDFLAGS,$CXXFLAGS) = ("", "");
     while (! /^------/) {
         if(/^\s*$/) {
@@ -97,13 +97,13 @@ sub reformat_results($)
 	    $QT="$1";
 	}
 	if (/QT4_VERSION = '([^']+)'/) {
-	    $QT4="$1";
+	    $QT="$1";
 	}
 	if (/Qt5_VERSION = '([^']+)'/) {
-	    $QT5="$1";
+	    $QT="$1";
 	}
 	if (/Qt6_VERSION = '([^']+)'/) {
-	    $QT6="$1";
+	    $QT="$1";
 	}
 	if (/BOOST_VERSION = '([^']+)'/) {
 	    $BOOST="$1";
@@ -150,8 +150,7 @@ $CMAKE
 $BOOST
 $MPFR
 $GMP
-$QT5
-$QT6
+$QT
 $LEDA_VERSION
 $CXXFLAGS
 $LDFLAGS