Merge branch 'SaisieJolieRebase1201' into SaisieJolieMerge10Apr

Change-Id: I802dbb9f7c0eebf75a1b6cd21ddd194e89b53752
This commit is contained in:
Léa Saviot
2018-04-10 17:21:54 +02:00
212 changed files with 7429 additions and 1510 deletions

View File

@@ -72,7 +72,7 @@ App::App(Container * container, Snapshot * snapshot) :
m_valuesHeader(nullptr, &m_valuesAlternateEmptyViewController, &m_valuesController),
m_valuesStackViewController(&m_tabViewController, &m_valuesHeader),
m_tabViewController(&m_inputViewController, snapshot, &m_listStackViewController, &m_graphStackViewController, &m_valuesStackViewController),
m_inputViewController(&m_modalViewController, &m_tabViewController, &m_listController)
m_inputViewController(&m_modalViewController, &m_tabViewController, &m_listController, &m_listController)
{
}