From: Max Waterman Date: Sun, 25 Apr 2010 04:11:15 +0000 (+0300) Subject: Fixes: Unit test project files. X-Git-Url: http://vcs.maemo.org/git/?p=ptas;a=commitdiff_plain;h=3556052e58602a9cb56c4ba4325fe92cdad797e7 Fixes: Unit test project files. --- diff --git a/zouba/debian/files b/zouba/debian/files index 3752086..a44eb77 100644 --- a/zouba/debian/files +++ b/zouba/debian/files @@ -1 +1 @@ -zouba_0.8_armel.deb user/navigation extra +zouba_0.9_armel.deb user/navigation extra diff --git a/zouba/tests/ut_gpscontroller/Makefile b/zouba/tests/ut_gpscontroller/Makefile index 5dc138f..0cf86ed 100644 --- a/zouba/tests/ut_gpscontroller/Makefile +++ b/zouba/tests/ut_gpscontroller/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: ut_gpscontroller -# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri Apr 23 07:10:27 2010 +# Generated by qmake (2.01a) (Qt 4.6.2) on: Sun Apr 25 07:10:29 2010 # Project: ut_gpscontroller.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile ut_gpscontroller.pro @@ -10,13 +10,13 @@ CC = gcc CXX = g++ -DEFINES = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DQT_TESTLIB_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED +DEFINES = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DQT_MAEMO5_LIB -DQT_TESTLIB_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED CFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES) CXXFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES) -INCPATH = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtGui -I/targets/FREMANTLE_ARMEL/usr/include/QtTest -I/targets/FREMANTLE_ARMEL/usr/include -I../../src -I. +INCPATH = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtGui -I/targets/FREMANTLE_ARMEL/usr/include/QtTest -I/targets/FREMANTLE_ARMEL/usr/include/QtMaemo5 -I/targets/FREMANTLE_ARMEL/usr/include -I../../src -I. LINK = g++ LFLAGS = -Wl,-rpath-link,/usr/lib -Wl,-rpath,/usr/lib -LIBS = $(SUBLIBS) -L/usr/lib /usr/lib/libQtLocation.so -lQtTest -L/usr/lib -lQtGui -L/usr/X11R6/lib -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread +LIBS = $(SUBLIBS) -L/usr/lib /usr/lib/libQtLocation.so -lQtMaemo5 -L/usr/lib -L/usr/X11R6/lib -lQtTest -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread AR = ar cqs RANLIB = QMAKE = /usr/bin/qmake @@ -136,12 +136,13 @@ Makefile: ut_gpscontroller.pro /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/l /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \ /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \ /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \ - /usr/lib/libQtTest.prl \ + /usr/lib/libQtMaemo5.prl \ + /usr/lib/libQtDBus.prl \ + /usr/lib/libQtXml.prl \ /usr/lib/libQtCore.prl \ /usr/lib/libQtGui.prl \ - /usr/lib/libQtNetwork.prl \ - /usr/lib/libQtDBus.prl \ - /usr/lib/libQtXml.prl + /usr/lib/libQtTest.prl \ + /usr/lib/libQtNetwork.prl $(QMAKE) -unix -o Makefile ut_gpscontroller.pro /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf: /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf: @@ -162,12 +163,13 @@ Makefile: ut_gpscontroller.pro /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/l /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf: /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf: /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf: -/usr/lib/libQtTest.prl: +/usr/lib/libQtMaemo5.prl: +/usr/lib/libQtDBus.prl: +/usr/lib/libQtXml.prl: /usr/lib/libQtCore.prl: /usr/lib/libQtGui.prl: +/usr/lib/libQtTest.prl: /usr/lib/libQtNetwork.prl: -/usr/lib/libQtDBus.prl: -/usr/lib/libQtXml.prl: qmake: FORCE @$(QMAKE) -unix -o Makefile ut_gpscontroller.pro diff --git a/zouba/tests/ut_gpscontroller/ut_gpscontroller b/zouba/tests/ut_gpscontroller/ut_gpscontroller index ddabd08..995b503 100755 Binary files a/zouba/tests/ut_gpscontroller/ut_gpscontroller and b/zouba/tests/ut_gpscontroller/ut_gpscontroller differ diff --git a/zouba/tests/ut_gpscontroller/ut_gpscontroller.pro b/zouba/tests/ut_gpscontroller/ut_gpscontroller.pro index 0eea86d..9021c16 100644 --- a/zouba/tests/ut_gpscontroller/ut_gpscontroller.pro +++ b/zouba/tests/ut_gpscontroller/ut_gpscontroller.pro @@ -11,6 +11,7 @@ MOBILITY = \ QT += \ testlib \ network \ + maemo5 \ INCLUDEPATH += \ $$ZOUBASRC \ diff --git a/zouba/tests/ut_location/ut_location.pro b/zouba/tests/ut_location/ut_location.pro index 03e058e..9a3fdc0 100644 --- a/zouba/tests/ut_location/ut_location.pro +++ b/zouba/tests/ut_location/ut_location.pro @@ -11,6 +11,7 @@ MOBILITY = \ QT += \ testlib \ network \ + maemo5 \ INCLUDEPATH += \ $$ZOUBASRC \ diff --git a/zouba/tests/ut_route/ut_route.pro b/zouba/tests/ut_route/ut_route.pro index 06f65dc..00aeaa8 100644 --- a/zouba/tests/ut_route/ut_route.pro +++ b/zouba/tests/ut_route/ut_route.pro @@ -11,6 +11,7 @@ MOBILITY = \ QT += \ testlib \ network \ + maemo5 \ INCLUDEPATH += \ $$ZOUBASRC \