From df17b26b40717e35a534e373b2070d37817cb4a3 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 28 May 2010 13:50:28 +0200
Subject: tst_qtextcodec: Fix broken merge conflict resolution

---
 config.tests/unix/fvisibility.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.tests/unix/fvisibility.test b/config.tests/unix/fvisibility.test
index 99e6fbe..5bc4b93 100755
--- a/config.tests/unix/fvisibility.test
+++ b/config.tests/unix/fvisibility.test
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 FVISIBILITY_SUPPORT=no
 COMPILER=$1
@@ -34,7 +34,7 @@ EOF
 
 
 case "$COMPILER" in
-gcc|g++)
+*g++*|*c++*)
     CMDLINE="-fvisibility=hidden"
     RunCompileTest
    ;;
-- 
cgit v0.12