diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-11-30 18:49:04 +0100 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-11-30 18:49:04 +0100 |
| commit | 412563b7ff18684f9786f4e40b1a4d538f2d5233 (patch) | |
| tree | 3190a317306cfb71b0d5d9bc4c0f06b260a92ce6 /tests/pipelinetest.cpp | |
| parent | 790991aa1007d3271d80bc7e77f5b4f86c9bcef0 (diff) | |
| parent | 6ad307dd846d07f1b55a1679a8d2eb47525af57d (diff) | |
| download | sink-412563b7ff18684f9786f4e40b1a4d538f2d5233.tar.gz sink-412563b7ff18684f9786f4e40b1a4d538f2d5233.zip | |
Merge branch 'feature/modelresult' into develop
Diffstat (limited to 'tests/pipelinetest.cpp')
| -rw-r--r-- | tests/pipelinetest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/pipelinetest.cpp b/tests/pipelinetest.cpp index 47090a8..f0fd1a4 100644 --- a/tests/pipelinetest.cpp +++ b/tests/pipelinetest.cpp | |||
| @@ -12,13 +12,13 @@ | |||
| 12 | #include "deleteentity_generated.h" | 12 | #include "deleteentity_generated.h" |
| 13 | #include "dummyresource/resourcefactory.h" | 13 | #include "dummyresource/resourcefactory.h" |
| 14 | #include "clientapi.h" | 14 | #include "clientapi.h" |
| 15 | #include "synclistresult.h" | ||
| 16 | #include "commands.h" | 15 | #include "commands.h" |
| 17 | #include "entitybuffer.h" | 16 | #include "entitybuffer.h" |
| 18 | #include "resourceconfig.h" | 17 | #include "resourceconfig.h" |
| 19 | #include "pipeline.h" | 18 | #include "pipeline.h" |
| 20 | #include "log.h" | 19 | #include "log.h" |
| 21 | #include "domainadaptor.h" | 20 | #include "domainadaptor.h" |
| 21 | #include "definitions.h" | ||
| 22 | 22 | ||
| 23 | static void removeFromDisk(const QString &name) | 23 | static void removeFromDisk(const QString &name) |
| 24 | { | 24 | { |