feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
89,126 Commits 108 Branches 368 Tags
3bbfd66bad465a2bc19a9477629f6bbad529e872
Commit Graph

8 Commits

Author SHA1 Message Date
Eike Ziller
3bbfd66bad Merge remote-tracking branch 'origin/14.0' 
Conflicts:
	src/plugins/android/androidmanager.cpp
	src/plugins/android/androidrunner.cpp
	src/plugins/android/androidrunner.h
	src/plugins/qmldesigner/components/texteditor/texteditorview.cpp
	src/plugins/qmldesigner/components/texteditor/texteditorview.h
	src/plugins/qmldesigner/designmodecontext.cpp
	src/plugins/qmldesigner/designmodecontext.h
	src/plugins/qmljseditor/qmljseditingsettingspage.cpp

Change-Id: Idada49bb7441e8c5b748bd75b2e6bb2351bd323e
 2024-07-25 12:56:53 +02:00
Christian Stenger
04bb6b95fe QmlJSEditor: Fix order of initialization 
Enabler need to get set after reading the settings.
Silences soft asserts.

Change-Id: I7e70279537a87462e607e51a40d9fef565b46fa8
Reviewed-by: hjk <hjk@qt.io>
 2024-07-11 08:36:00 +00:00
hjk
386e3c3c12 QmlJsEditor: Use a SelectionAspect for the open mode choice 
Change-Id: Ieac7371bfa71dfc5387e442d717eb53a4fae6fb8
Reviewed-by: Semih Yavuz <semih.yavuz@qt.io>
 2024-07-10 14:33:36 +00:00
hjk
b17b6f61e5 QmlJsEditor: Further aspectify settings gui 
Change-Id: Ia14289a414e23c6e830d88bbfe0a69577c0f2a31
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2024-07-10 11:49:39 +00:00
hjk
cdf8d79adb QmlJsEditor: Partially aspectify settings 
Only the non-gui part for now.

Change-Id: I97e59f6cb251bfb1be4dd88cc2c2f9c2e71ce219
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2024-06-28 07:50:29 +00:00
hjk
803c068c30 QmlJsEditor: Merge LS settings files into main settings file 
Collecting relevant pieces in preparation of settings aspectification.

Change-Id: Ia221de3babf301f4f5d3583d346eeb9f91046aa4
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2024-06-28 07:12:50 +00:00
Eike Ziller
8dccc9c59e Merge remote-tracking branch 'origin/14.0' 
Conflicts:
	src/plugins/qmljseditor/qmljseditorsettings.cpp

Change-Id: I443424afdfe48cdfc3d083d8e91335e937fcfdb6
 2024-06-27 11:41:54 +02:00
hjk
e3d3af81cb QmlJsEditor: Start aspectification of settings 
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>
 2024-06-24 06:12:59 +00:00