diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-02 06:15:41 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-02 06:15:41 (GMT) |
| commit | 0549df8e6b43fc6aa3d3750bcd0346344f272fd1 (patch) | |
| tree | 94e532f2e3018aaf7b01b896e255b2376aa626b3 /config.tests | |
| parent | 49bceaf197a5964f244ac094aaa75b35cf3ada49 (diff) | |
| parent | c84fefd59090c0d0f757572fe14b493d94759808 (diff) | |
| download | Qt-0549df8e6b43fc6aa3d3750bcd0346344f272fd1.zip Qt-0549df8e6b43fc6aa3d3750bcd0346344f272fd1.tar.gz Qt-0549df8e6b43fc6aa3d3750bcd0346344f272fd1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'config.tests')
| -rwxr-xr-x | config.tests/unix/compile.test | 3 | ||||
| -rw-r--r-- | config.tests/unix/openvg/openvg.pro | 8 | ||||
| -rw-r--r-- | config.tests/unix/shivavg/shivavg.pro | 4 |
3 files changed, 14 insertions, 1 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index a854bd1..550890f 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -64,7 +64,8 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST" cd "$OUTDIR/$TEST" -make distclean >/dev/null 2>&1 +test -r Makefile && make distclean >/dev/null 2>&1 + "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then diff --git a/config.tests/unix/openvg/openvg.pro b/config.tests/unix/openvg/openvg.pro index 8dd227b..4bbde99 100644 --- a/config.tests/unix/openvg/openvg.pro +++ b/config.tests/unix/openvg/openvg.pro @@ -4,6 +4,14 @@ SOURCES += openvg.cpp !isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG !isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG +# Some OpenVG engines (e.g. ShivaVG) are implemented on top of OpenGL. +# Add the extra includes and libraries for that case. +openvg_on_opengl { + !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL + !isEmpty(QMAKE_LIBDIR_OPENGL): LIBS += -L$$QMAKE_LIBDIR_OPENGL + !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL +} + lower_case_includes { DEFINES += QT_LOWER_CASE_VG_INCLUDES } diff --git a/config.tests/unix/shivavg/shivavg.pro b/config.tests/unix/shivavg/shivavg.pro index 0c1bd07..39d7bcc 100644 --- a/config.tests/unix/shivavg/shivavg.pro +++ b/config.tests/unix/shivavg/shivavg.pro @@ -4,4 +4,8 @@ SOURCES += shivavg.cpp !isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG !isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG +!isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL +!isEmpty(QMAKE_LIBDIR_OPENGL): LIBS += -L$$QMAKE_LIBDIR_OPENGL +!isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL + CONFIG -= qt |