mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-09-10 12:03:18 +02:00
app: qmlregister: Revert signature of registerTypes to fix unit tests.
This reverts an (inadvertent?) change made in 70a6972b7
which would
fail the compilation of the tests.
* src/app/qmlregister.h (registerTypes): Change parent type from
MainApplication* to QObject*
* src/app/qmlregister.cpp (registerTypes): Likewise.
Change-Id: I1ef0aff38fcc9e07192d505614ebf9e2aa023921
This commit is contained in:
parent
79bd338f6e
commit
0e2bd79b8d
2 changed files with 2 additions and 2 deletions
|
@ -106,7 +106,7 @@ registerTypes(QQmlEngine* engine,
|
|||
AppSettingsManager* settingsManager,
|
||||
PreviewEngine* previewEngine,
|
||||
ScreenInfo* screenInfo,
|
||||
MainApplication* parent)
|
||||
QObject* parent)
|
||||
{
|
||||
// setup the adapters (their lifetimes are that of MainApplication)
|
||||
auto callAdapter = new CallAdapter(systemTray, lrcInstance, parent);
|
||||
|
|
|
@ -67,5 +67,5 @@ void registerTypes(QQmlEngine* engine,
|
|||
AppSettingsManager* appSettingsManager,
|
||||
PreviewEngine* previewEngine,
|
||||
ScreenInfo* screenInfo,
|
||||
MainApplication* parent);
|
||||
QObject* parent);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue