forked from qt-creator/qt-creator
Instead of adding a second toolbar widget, replace the current one. This avoids weird situations where you get two outline toolbar widgets, one provided by qmljseditorwidget and another one provided by qmlls. Turning the language server on deletes the combobox created by qmljseditorwidget, such that qmljseditorwidget has to recreate its combobox after the language server stopped being in use. Also make sure that m_outlineCombo is set to nullptr after it gets deleted, such that late jumpToOutlineElement and updateOutlineIndexNow() calls do no try to attempt stuff on an already free'd pointer. Change-Id: Ie323a7b3e7a4d5e24407fcedf8383dd2f0efe525 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
42 KiB
42 KiB