summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-05-30 08:46:52 +0800
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-05-30 08:46:52 +0800
commitac6c4bf7bfe2cf44a9203525e05b23002a55f40e (patch)
tree7cb8312f974ea4e3f786bcb123f22c5328981665
parent99812e94289a083e9d297af50f5b227e3ad58f52 (diff)
change frameswappedsandbox/wangzhiqiang/als2019
-rw-r--r--app/src/main.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/src/main.cpp b/app/src/main.cpp
index 986ebc1..57a6020 100644
--- a/app/src/main.cpp
+++ b/app/src/main.cpp
@@ -129,7 +129,7 @@ int main(int argc, char* argv[]) {
qwm->activateWindow(role.toStdString().c_str(), json_object_get_string(obj_area));
}
else {
- qwm->activateWindow(role.toStdString().c_str(), "normal");
+ qwm->activateWindow(role.toStdString().c_str());
}
});
@@ -140,8 +140,7 @@ int main(int argc, char* argv[]) {
QObject* root = engine.rootObjects().first();
QQuickWindow* window = qobject_cast<QQuickWindow*>(root);
- QObject::connect(window, SIGNAL(frameSwapped()), qwm,
- SLOT(slotActivateSurface()));
+ homescreenHandler->setQuickWindow(window);
}
return app.exec();
}