Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits)
  fix autotest on windows (again)
  fix autotest on windows
  Ammend last INTEGRITY fix
  Fix qmake build on Windows
  fix test for QtLighthouse
  add test for suppressing warnings in moc
  Ammend INTEGRITY fixes
  Store property editor's column positions in settings
  add gsm to connectable bearer for networkmanager.
  Fix license headers
  add missing include
  Silence GHS compiler
  Run on INTEGRITY
  Fix compilation on INTEGRITY
  Do not link with libm on INTEGRITY
  Add a "-nn" option to moc
  Add Documentation about INTEGRITY RTOS
  List the INTEGRITY drivers as well
  Use TCP_LOCALSOCKET on INTEGRITY
  Compile for systems without mmap
  ...

1 files changed, 4 insertions, 0 deletions

diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.cpp b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
index 521b5cb..9f298d0 100644
--- a/tools/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -91,6 +91,7 @@ static const char *ViewKeyC = "View";
 static const char *ColorKeyC = "Colored";
 static const char *SortedKeyC = "Sorted";
 static const char *ExpansionKeyC = "ExpandedItems";
+static const char *SplitterPositionKeyC = "SplitterPosition";
 
 enum SettingsView { TreeView, ButtonView };
 
@@ -365,10 +366,12 @@ PropertyEditor::PropertyEditor(QDesignerFormEditorInterface *core, QWidget *pare
     m_sorting = settings->value(QLatin1String(SortedKeyC), false).toBool();
     m_coloring = settings->value(QLatin1String(ColorKeyC), true).toBool();
     const QVariantMap expansionState = settings->value(QLatin1String(ExpansionKeyC), QVariantMap()).toMap();
+    const int splitterPosition = settings->value(QLatin1String(SplitterPositionKeyC), 150).toInt();
     settings->endGroup();
     // Apply settings
     m_sortingAction->setChecked(m_sorting);
     m_coloringAction->setChecked(m_coloring);
+    m_treeBrowser->setSplitterPosition(splitterPosition);
 #if QT_VERSION >= 0x040500
     switch (view) {
     case TreeView:
@@ -415,6 +418,7 @@ void PropertyEditor::saveSettings() const
             expansionState.insert(it.key(), QVariant(it.value()));
     }
     settings->setValue(QLatin1String(ExpansionKeyC), expansionState);
+    settings->setValue(QLatin1String(SplitterPositionKeyC), m_treeBrowser->splitterPosition());
     settings->endGroup();
 }