diff options
Diffstat (limited to 'config.tests/unix')
-rw-r--r-- | config.tests/unix/gstreamer/gstreamer.pro | 3 | ||||
-rw-r--r-- | config.tests/unix/icu/icu.pro | 16 | ||||
-rwxr-xr-x | config.tests/unix/makeabs | 14 | ||||
-rw-r--r-- | config.tests/unix/pps/pps.cpp (renamed from config.tests/unix/gstreamer/gstreamer.cpp) | 19 | ||||
-rw-r--r-- | config.tests/unix/pps/pps.pro | 3 |
5 files changed, 31 insertions, 24 deletions
diff --git a/config.tests/unix/gstreamer/gstreamer.pro b/config.tests/unix/gstreamer/gstreamer.pro deleted file mode 100644 index 7d4aa8e2e5..0000000000 --- a/config.tests/unix/gstreamer/gstreamer.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = gstreamer.cpp -CONFIG -= qt -LIBS += -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro index 002c4840d5..2c1b431f92 100644 --- a/config.tests/unix/icu/icu.pro +++ b/config.tests/unix/icu/icu.pro @@ -1,4 +1,16 @@ SOURCES = icu.cpp +CONFIG += console CONFIG -= qt dylib -unix:LIBS += -licuuc -licui18n -win32:LIBS += -licuin +win32 { + CONFIG(static, static|shared) { + CONFIG(debug, debug|release) { + LIBS += -lsicuind -lsicuucd -lsicudtd + } else { + LIBS += -lsicuin -lsicuuc -lsicudt + } + } else { + LIBS += -licuin -licuuc + } +} else { + LIBS += -licui18n -licuuc +} diff --git a/config.tests/unix/makeabs b/config.tests/unix/makeabs index 4df26f769f..d2f65d19e9 100755 --- a/config.tests/unix/makeabs +++ b/config.tests/unix/makeabs @@ -15,13 +15,13 @@ elif [ "$OSTYPE" = "msys" -a -z "${FILE##[a-zA-Z]:[/\\]*}" ]; then true else RES="$PWD/$FILE" - test -d "$RES" && RES="$RES/" - RES=`echo "$RES" | sed "s,/\(\./\)*,/,g"` - -# note: this will only strip 1 /path/../ from RES, i.e. given /a/b/c/../../../, it returns /a/b/../../ - RES=`echo "$RES" | sed "s,\(/[^/]*/\)\.\./,/,g"` - - RES=`echo "$RES" | sed "s,//,/,g" | sed "s,/$,,"` fi +RES=$RES/ +while true; do + nres=`echo "$RES" | sed "s,/[^/][^/]*/\.\./,/,g; s,/\./,/,g"` + test x"$nres" = x"$RES" && break + RES=$nres +done +RES=`echo "$RES" | sed "s,//,/,g; s,/$,,"` echo $RES #return diff --git a/config.tests/unix/gstreamer/gstreamer.cpp b/config.tests/unix/pps/pps.cpp index 3864cdcb9f..3f00509973 100644 --- a/config.tests/unix/gstreamer/gstreamer.cpp +++ b/config.tests/unix/pps/pps.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 BlackBerry Limited. All rights reserved. ** Contact: http://www.qt-project.org/legal ** ** This file is part of the config.tests of the Qt Toolkit. @@ -39,17 +39,12 @@ ** ****************************************************************************/ -#include <gst/gst.h> -#include <gst/interfaces/propertyprobe.h> -#include <gst/interfaces/xoverlay.h> +#include <sys/pps.h> -#if !defined(GST_VERSION_MAJOR) \ - || !defined(GST_VERSION_MINOR) -# error "No GST_VERSION_* macros" -#elif GST_VERION_MAJOR != 0 && GST_VERSION_MINOR != 10 -# error "Incompatible version of GStreamer found (Version 0.10.x is required)." -#endif - -int main(int argc, char **argv) +int main(int, char **) { + pps_decoder_t decoder; + + pps_decoder_initialize(&decoder, NULL); + return 0; } diff --git a/config.tests/unix/pps/pps.pro b/config.tests/unix/pps/pps.pro new file mode 100644 index 0000000000..21bdeedbfb --- /dev/null +++ b/config.tests/unix/pps/pps.pro @@ -0,0 +1,3 @@ +SOURCES = pps.cpp +CONFIG -= qt +LIBS += -lpps |