summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-05-28 11:50:28 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-05-28 11:52:08 (GMT)
commitdf17b26b40717e35a534e373b2070d37817cb4a3 (patch)
tree517802c76e265dd8cac99d31c451ec6819b2d398
parentddff256949b93171d4428aaa037051bb5f1fca02 (diff)
downloadQt-df17b26b40717e35a534e373b2070d37817cb4a3.zip
Qt-df17b26b40717e35a534e373b2070d37817cb4a3.tar.gz
Qt-df17b26b40717e35a534e373b2070d37817cb4a3.tar.bz2
tst_qtextcodec: Fix broken merge conflict resolution
-rwxr-xr-xconfig.tests/unix/fvisibility.test4
1 files 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
;;