summaryrefslogtreecommitdiff
path: root/tests/test-resource
diff options
context:
space:
mode:
authorWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-09 12:07:31 +0200
committerWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-09 12:14:46 +0200
commit381719b9a0adb8553a041633aed943f5ef48a1ff (patch)
tree6c5db8b6a7342dee77b1e1a010a6618fd824714f /tests/test-resource
parent6751c585385f017d08540bbe121606d642afb220 (diff)
Restructured libresourceqt includes, updated debianpackages to soversion=1.
Fixed ResourceEngine to work with the new Resource object.
Diffstat (limited to 'tests/test-resource')
-rw-r--r--tests/test-resource/test-resource.h2
-rw-r--r--tests/test-resource/test-resource.pro12
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/test-resource/test-resource.h b/tests/test-resource/test-resource.h
index fc04c47..61a48ea 100644
--- a/tests/test-resource/test-resource.h
+++ b/tests/test-resource/test-resource.h
@@ -3,7 +3,7 @@
#include <QtTest/QTest>
#include <QMetaType>
-#include "resources.h"
+#include <policy/resources.h>
Q_DECLARE_METATYPE(ResourcePolicy::ResourceType)
diff --git a/tests/test-resource/test-resource.pro b/tests/test-resource/test-resource.pro
index 6ff2f35..c6ec6ab 100644
--- a/tests/test-resource/test-resource.pro
+++ b/tests/test-resource/test-resource.pro
@@ -1,13 +1,13 @@
-BASE = ../../libresourceqt
+include(../../common.pri)
TEMPLATE = app
TARGET = test-resource
DESTDIR = build
-DEPENDPATH += $${BASE}/include $${BASE}/src .
-INCLUDEPATH += $${BASE}/src $${BASE}/include
+DEPENDPATH += $${POLICY} $${LIBRESOURCEQT}/src .
+INCLUDEPATH += $${LIBRESOURCEQT}/src $${LIBRESOURCEINC}
# Input
-HEADERS += $${BASE}/include/resource.h $${BASE}/include/resources.h test-resource.h
-SOURCES += $${BASE}/src/resource.cpp $${BASE}/src/resources.cpp test-resource.cpp
+HEADERS += $${POLICY}/resource.h $${POLICY}/resources.h test-resource.h
+SOURCES += $${LIBRESOURCEQT}/src/resource.cpp $${LIBRESOURCEQT}/src/resources.cpp test-resource.cpp
OBJECTS_DIR = build
MOC_DIR = build
@@ -17,5 +17,5 @@ QT -= gui
# Install directives
INSTALLBASE = /usr
-target.path = $$INSTALLBASE/lib/libresourceqt-tests/
+target.path = $${INSTALLBASE}/lib/libresourceqt-tests/
INSTALLS = target