Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move SandboxFileEngineHandler from tests to libssu
  • Loading branch information
martyone committed Apr 4, 2013
1 parent 16fe343 commit afd5ef2
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 10 deletions.
2 changes: 2 additions & 0 deletions libssu/libssu.pro
Expand Up @@ -7,6 +7,7 @@ public_headers = \

HEADERS = \
$${public_headers} \
sandboxfileenginehandler_p.h \
ssucoreconfig.h \
ssudeviceinfo.h \
ssulog.h \
Expand All @@ -15,6 +16,7 @@ HEADERS = \
ssurepomanager.h \

SOURCES = \
sandboxfileenginehandler.cpp \
ssu.cpp \
ssucoreconfig.cpp \
ssudeviceinfo.cpp \
Expand Down
Expand Up @@ -5,7 +5,7 @@
* @date 2013
*/

#include "sandboxfileenginehandler.h"
#include "sandboxfileenginehandler_p.h"

#include <QtCore/QDir>
#include <QtCore/QFSFileEngine>
Expand Down
@@ -1,12 +1,12 @@
/**
* @file sandboxfileenginehandler.h
* @file sandboxfileenginehandler_p.h
* @copyright 2013 Jolla Ltd.
* @author Martin Kampas <martin.kampas@tieto.com>
* @date 2013
*/

#ifndef _SANDBOXINGFILEENGINEHANDLER_H
#define _SANDBOXINGFILEENGINEHANDLER_H
#ifndef _SANDBOXINGFILEENGINEHANDLER_P_H
#define _SANDBOXINGFILEENGINEHANDLER_P_H

#include <QtCore/QAbstractFileEngineHandler>

Expand Down
2 changes: 1 addition & 1 deletion tests/testutils/sandboxhook.cpp
@@ -1,6 +1,6 @@
#include <dlfcn.h>

#include "sandboxfileenginehandler.h"
#include "libssu/sandboxfileenginehandler_p.h"

extern "C" void qt_startup_hook()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/testutils/sandboxhook_dependencies.pri
@@ -1 +1 @@
include(../testutils/testutils.pri)
include(../../libssu/libssu.pri)
2 changes: 0 additions & 2 deletions tests/testutils/testutils.pro
Expand Up @@ -3,11 +3,9 @@ include(../testlibrary.pri)

HEADERS = \
process.h \
sandboxfileenginehandler.h \

SOURCES = \
process.cpp \
sandboxfileenginehandler.cpp \

exec_wrapper.path = $$TESTS_PATH
exec_wrapper.files = runtest.sh
Expand Down
2 changes: 1 addition & 1 deletion tests/ut_urlresolver/main.cpp
Expand Up @@ -7,7 +7,7 @@

#include <QtTest/QtTest>

#include "testutils/sandboxfileenginehandler.h"
#include "libssu/sandboxfileenginehandler_p.h"
#include "urlresolvertest.cpp"

int main(int argc, char **argv){
Expand Down
1 change: 0 additions & 1 deletion tests/ut_urlresolver/ut_urlresolver_dependencies.pri
@@ -1,2 +1 @@
include(../../libssu/libssu.pri)
include(../testutils/testutils.pri)

0 comments on commit afd5ef2

Please sign in to comment.