From 5748ff8e81efa6f2b07aac9a023dbda2ca2cdd69 Mon Sep 17 00:00:00 2001 From: Wolf Bergenheim Date: Mon, 15 Feb 2010 08:56:30 +0200 Subject: Integrated Engine and Set and DBusQEventLoop together --- tests/test-resource-engine/test-resource-engine.pro | 4 +++- tests/test-resource-set/test-resource-set.pro | 15 +++++++++++---- tests/test-resource/test-resource.pro | 2 ++ 3 files changed, 16 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/test-resource-engine/test-resource-engine.pro b/tests/test-resource-engine/test-resource-engine.pro index 2c0d4a7..d558bc2 100644 --- a/tests/test-resource-engine/test-resource-engine.pro +++ b/tests/test-resource-engine/test-resource-engine.pro @@ -3,7 +3,7 @@ TEMPLATE = app TARGET = test-resource-engine DESTDIR = build DEPENDPATH += $${POLICY} $${LIBRESOURCEQT}/src . -INCLUDEPATH += $${LIBRESOURCEQT}/src $${LIBRESOURCEINC} /usr/include/resource +INCLUDEPATH += $${LIBRESOURCEQT}/src $${LIBRESOURCEINC} $${LIBDBUSQEVENTLOOP} /usr/include/resource # Input HEADERS += $${POLICY}/resource.h \ @@ -20,6 +20,8 @@ SOURCES += $${LIBRESOURCEQT}/src/resource.cpp \ OBJECTS_DIR = build MOC_DIR = build +QMAKE_CXXFLAGS += -Wall +LIBS += -L$${LIBDBUSQEVENTLOOP}/build -ldbus-qeventloop CONFIG += qt qtestlib debug warn_on link_pkgconfig QT -= gui diff --git a/tests/test-resource-set/test-resource-set.pro b/tests/test-resource-set/test-resource-set.pro index aa3ebca..84bed87 100644 --- a/tests/test-resource-set/test-resource-set.pro +++ b/tests/test-resource-set/test-resource-set.pro @@ -3,18 +3,25 @@ TEMPLATE = app TARGET = test-resource-set DESTDIR = build DEPENDPATH += $${POLICY} $${BASE}/src . -INCLUDEPATH += $${LIBRESOURCEQT}/src $${LIBRESOURCEINC} +INCLUDEPATH += $${LIBRESOURCEQT}/src $${LIBRESOURCEINC} $${LIBDBUSQEVENTLOOP} # Input -HEADERS += $${POLICY}/resources.h $${POLICY}/resource-set.h test-resource-set.h +HEADERS += $${POLICY}/resources.h $${POLICY}/resource-set.h test-resource-set.h \ + $${LIBRESOURCEQT}/src/resource-engine.h + SOURCES += $${LIBRESOURCEQT}/src/resource.cpp $${LIBRESOURCEQT}/src/resources.cpp \ - $${LIBRESOURCEQT}/src/resource-set.cpp test-resource-set.cpp + $${LIBRESOURCEQT}/src/resource-engine.cpp \ + $${LIBRESOURCEQT}/src/resource-set.cpp test-resource-set.cpp OBJECTS_DIR = build MOC_DIR = build -CONFIG += qt qtestlib debug warn_on +QMAKE_CXXFLAGS += -Wall +LIBS += -L$${LIBDBUSQEVENTLOOP}/build -ldbus-qeventloop + +CONFIG += qt qtestlib debug warn_on link_pkgconfig QT -= gui +PKGCONFIG += dbus-1 libresource0 # Install directives INSTALLBASE = /usr diff --git a/tests/test-resource/test-resource.pro b/tests/test-resource/test-resource.pro index c6ec6ab..b103412 100644 --- a/tests/test-resource/test-resource.pro +++ b/tests/test-resource/test-resource.pro @@ -12,6 +12,8 @@ SOURCES += $${LIBRESOURCEQT}/src/resource.cpp $${LIBRESOURCEQT}/src/resources.c OBJECTS_DIR = build MOC_DIR = build +QMAKE_CXXFLAGS += -Wall + CONFIG += qt qtestlib debug warn_on QT -= gui -- cgit v1.2.3