diff options
| author | Paul Olav Tvete <paul.tvete@digia.com> | 2013-03-04 10:16:42 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 08:31:23 +0100 |
| commit | 97fcf3bc987a18f32233fea550eb4a5a22e2b822 (patch) | |
| tree | 31d75557fdc4a525af8f5053db514066c63bd1bd /config.tests | |
| parent | 1b582d64eb6d13e60a02ebc40956302a4864eb6c (diff) | |
Introducing the Qt Android port
Based on the Necessitas project by Bogdan Vatra.
Contributors to the Qt5 project:
BogDan Vatra <bogdan@kde.org>
Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
hjk <hjk121@nokiamail.com>
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Paul Olav Tvete <paul.tvete@digia.com>
Robin Burchell <robin+qt@viroteck.net>
Samuel Rødal <samuel.rodal@digia.com>
Yoann Lopes <yoann.lopes@digia.com>
The full history of the Qt5 port can be found in refs/old-heads/android,
SHA-1 249ca9ca2c7d876b91b31df9434dde47f9065d0d
Change-Id: Iff1a7b2dbb707c986f2639e65e39ed8f22430120
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/qpa/linuxfb/linuxfb.cpp | 1 | ||||
| -rwxr-xr-x | config.tests/unix/arch.test | 2 | ||||
| -rwxr-xr-x | config.tests/unix/compile.test | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/config.tests/qpa/linuxfb/linuxfb.cpp b/config.tests/qpa/linuxfb/linuxfb.cpp index 892c3d9eae..81a257864e 100644 --- a/config.tests/qpa/linuxfb/linuxfb.cpp +++ b/config.tests/qpa/linuxfb/linuxfb.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include <linux/fb.h> +#include <sys/kd.h> #include <sys/ioctl.h> int main(int, char **) diff --git a/config.tests/unix/arch.test b/config.tests/unix/arch.test index 7250d737ba..e65541cda7 100755 --- a/config.tests/unix/arch.test +++ b/config.tests/unix/arch.test @@ -36,6 +36,8 @@ if [ -f ./arch.exe ]; then binary=./arch.exe elif [ -f ./arch ]; then binary=./arch +elif [ -f ./libarch.so ]; then + binary=./libarch.so else [ "$VERBOSE" = "yes" ] && echo "Unable to determine architecture!" exit 2 diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index 994b21c447..6b90044009 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -67,7 +67,7 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 # Make sure output from possible previous tests is gone rm -f "$EXE" "${EXE}.exe" -set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" +set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then OUTDIR=$OUTDIR "$@" $MAKE |