summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2013-06-18 08:59:24 +0200
committerPierre Rossi <pierre.rossi@digia.com>2013-06-18 10:34:15 +0200
commit1b065b291ece9e1228773544633cc21dd0bb4674 (patch)
tree3e77e6deaf05af0fa346830b2e51662ea6db0923 /shared
parentc6144131d1f97bcd69682bb733a54f2cd777f127 (diff)
cleaner content margins for the nested layouts
also remove QQUICKWEBENGINE env var
Diffstat (limited to 'shared')
-rw-r--r--shared/native_view_container_qt.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/shared/native_view_container_qt.h b/shared/native_view_container_qt.h
index fbb29ee85..ce977ac19 100644
--- a/shared/native_view_container_qt.h
+++ b/shared/native_view_container_qt.h
@@ -15,7 +15,7 @@ public:
: m_embeddable(0)
, m_currentQQuickNativeView(0)
, m_currentQWidgetNativeView(0)
- , m_isQQuick(!qgetenv("QQUICKWEBENGINE").isNull())
+ , m_isQQuick(true)
{
}
@@ -34,8 +34,12 @@ public:
QVBoxLayout* widget()
{
- if (!m_embeddable)
- m_embeddable = new QVBoxLayout;
+ if (!m_embeddable) {
+ m_isQQuick = false;
+ QVBoxLayout *l = new QVBoxLayout;
+ l->setContentsMargins(0, 0, 0, 0);
+ m_embeddable = l;
+ }
return static_cast<QVBoxLayout*>(m_embeddable);
}