Conflicts: src/plugins/qmljseditor/qmljseditorsettings.cpp Change-Id: I443424afdfe48cdfc3d083d8e91335e937fcfdb6
Rename qmljseditingsettingspage.* to qmljseditorsettings.*, re-arrange some includes, use settings() for the singleton access etc. Change-Id: Iff36a99baf0afd238a935386e9111818be5d7987 Reviewed-by: Christian Stenger <christian.stenger@qt.io>