Merge lp://staging/~michihenning/unity-scopes-api/merge-devel into lp://staging/unity-scopes-api

HACKING (+4/-4)
debian/changelog (+8/-0)
debian/control (+4/-117)
debian/control.in (+2/-0)
include/unity/scopes/internal/RegistryObject.h (+2/-1)
include/unity/scopes/testing/MockObject.h (+3/-0)
include/unity/scopes/testing/MockPreviewReply.h (+3/-0)
include/unity/scopes/testing/MockQueryCtrl.h (+3/-0)
include/unity/scopes/testing/MockRegistry.h (+3/-0)
include/unity/scopes/testing/MockScope.h (+3/-0)
include/unity/scopes/testing/MockSearchReply.h (+3/-0)
include/unity/scopes/testing/TypedScopeFixture.h (+3/-0)
scoperegistry/scoperegistry.cpp (+7/-0)
src/scopes/internal/RegistryObject.cpp (+3/-3)
test/gtest/CMakeLists.txt (+1/-18)
test/gtest/scopes/Activation/Activation_test.cpp (+5/-1)
test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp (+6/-2)
test/gtest/scopes/Aggregation/ChildScopes_test.cpp (+13/-9)
test/gtest/scopes/Aggregation/Keywords_test.cpp (+10/-6)
test/gtest/scopes/Aggregation/LoopDetection_test.cpp (+21/-18)
test/gtest/scopes/Annotation/Annotation_test.cpp (+4/-0)
test/gtest/scopes/CannedQuery/CannedQuery_test.cpp (+5/-1)
test/gtest/scopes/CategorisedResult/CategorisedResult_test.cpp (+4/-0)
test/gtest/scopes/Category/Category_test.cpp (+3/-0)
test/gtest/scopes/CategoryRenderer/CategoryRenderer_test.cpp (+4/-0)
test/gtest/scopes/ColumnLayout/ColumnLayout_test.cpp (+4/-0)
test/gtest/scopes/DateTimePickerFilter/DateTimePickerFilter_test.cpp (+4/-0)
test/gtest/scopes/Department/Department_test.cpp (+4/-0)
test/gtest/scopes/Filters/Filters_test.cpp (+5/-1)
test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp (+4/-0)
test/gtest/scopes/Invocation/Invocation_test.cpp (+3/-0)
test/gtest/scopes/Location/Location_test.cpp (+5/-1)
test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp (+8/-4)
test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp (+5/-0)
test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp (+4/-0)
test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp (+5/-1)
test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp (+4/-0)
test/gtest/scopes/RangeInputFilter/RangeInputFilter_test.cpp (+4/-0)
test/gtest/scopes/RatingFilter/RatingFilter_test.cpp (+5/-0)
test/gtest/scopes/Registry/Registry_test.cpp (+33/-16)
test/gtest/scopes/ReplyReaper/NoReplyScope.cpp (+3/-0)
test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp (+4/-0)
test/gtest/scopes/ResultCache/ResultCache_test.cpp (+39/-34)
test/gtest/scopes/Runtime/PusherScope.cpp (+3/-0)
test/gtest/scopes/Runtime/Runtime_test.cpp (+5/-2)
test/gtest/scopes/Runtime/SlowCreateScope.cpp (+3/-0)
test/gtest/scopes/Runtime/TestScope.cpp (+4/-0)
test/gtest/scopes/ScopeBase/ScopeBase_test.cpp (+3/-0)
test/gtest/scopes/ScopeExceptions/ScopeExceptions_test.cpp (+3/-0)
test/gtest/scopes/StandAloneScope/StandAloneScope_test.cpp (+3/-0)
test/gtest/scopes/StripLocation/StripLocation_test.cpp (+3/-0)
test/gtest/scopes/SwitchFilter/SwitchFilter_test.cpp (+4/-0)
test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp (+12/-9)
test/gtest/scopes/ThrowingScope/ThrowingScope_test.cpp (+14/-11)
test/gtest/scopes/ValueSliderFilter/ValueSliderFilter_test.cpp (+6/-2)
test/gtest/scopes/Variant/Variant_test.cpp (+5/-2)
test/gtest/scopes/VariantBuilder/VariantBuilder_test.cpp (+5/-1)
test/gtest/scopes/Version/Version_test.cpp (+3/-0)
test/gtest/scopes/internal/CategoryRegistry/CategoryRegistry_test.cpp (+3/-0)
test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp (+3/-0)
test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp (+3/-0)
test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp (+9/-6)
test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp (+4/-0)
test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp (+7/-4)
test/gtest/scopes/internal/Logger/Logger_test.cpp (+5/-0)
test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp (+3/-0)
test/gtest/scopes/internal/Reaper/Reaper_test.cpp (+17/-14)
test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp (+3/-0)
test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp (+3/-1)
test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp (+4/-0)
test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp (+3/-0)
test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp (+4/-0)
test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp (+9/-6)
test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp (+3/-0)
test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp (+5/-2)
test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp (+25/-21)
test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp (+4/-0)
test/gtest/scopes/internal/ThreadSafeQueue/ThreadSafeQueue_test.cpp (+3/-0)
test/gtest/scopes/internal/UniqueID/UniqueID_test.cpp (+3/-0)
test/gtest/scopes/internal/Utils/Utils_test.cpp (+21/-5)
test/gtest/scopes/internal/gobj_ptr/gobj_ptr_test.cpp (+12/-8)
test/gtest/scopes/internal/safe_strerror/safe_strerror_test.cpp (+4/-0)
test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp (+4/-0)
test/gtest/scopes/internal/smartscopes/SSConfig/SSConfig_test.cpp (+3/-0)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+24/-20)
test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp (+11/-7)
test/gtest/scopes/internal/zmq_middleware/ConnectionPool/ConnectionPool_test.cpp (+3/-0)
test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp (+4/-0)
test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp (+4/-0)
test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp (+4/-1)
test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp (+3/-0)
test/gtest/scopes/internal/zmq_middleware/StopPublisher/StopPublisher_test.cpp (+3/-0)
test/gtest/scopes/internal/zmq_middleware/Util/Util_test.cpp (+4/-0)
test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp (+5/-1)
test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp (+3/-0)
test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp (+5/-1)
test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp (+3/-0)
test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp (+3/-0)
test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp (+4/-1)
test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp (+3/-0)
test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp (+5/-2)
test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp (+4/-1)
test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp (+3/-1)
test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp (+3/-0)
test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp (+3/-1)
test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp (+4/-0)
test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp (+3/-0)
test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp (+3/-1)
test/gtest/scopes/qt/qt-bindings/QUtils_test.cpp (+4/-1)
test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp (+3/-0)
test/gtest/scopes/stress/scopes-stress.cpp (+6/-2)
test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp (+3/-0)
test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp (+3/-0)
test/gtest/scopes/testing/Statistics/Statistics_test.cpp (+3/-0)
test/gtest/scopes/utility/BufferedResultForwarder/BufferedResultForwarder_test.cpp (+4/-0)