diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2023-07-04 20:35:24 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-07-04 20:36:03 +0200 |
| commit | d9910058a394330a404239ca38d95d909f15c68e (patch) | |
| tree | 22437614d76a7dfe8aabcf7bdfe4c8c46f48fee9 /src/plugins/qmldesignerbase | |
| parent | ae7e72cca51e309b50056fa095f3e913906f367c (diff) | |
| parent | 7fada70e8f77fdccf7efc931421cf456561e097a (diff) | |
Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I91d9877ef6637d21e1106d6d363275295e6b55a3
Diffstat (limited to 'src/plugins/qmldesignerbase')
| -rw-r--r-- | src/plugins/qmldesignerbase/utils/designersettings.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesignerbase/utils/designersettings.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesignerbase/utils/designersettings.cpp b/src/plugins/qmldesignerbase/utils/designersettings.cpp index fe1ee169c7a..7071cfffbd1 100644 --- a/src/plugins/qmldesignerbase/utils/designersettings.cpp +++ b/src/plugins/qmldesignerbase/utils/designersettings.cpp @@ -85,11 +85,11 @@ void DesignerSettings::fromSettings(QSettings *settings) restoreValue(settings, DesignerSettingsKey::EDIT3DVIEW_GRID_COLOR, "#aaaaaa"); restoreValue(settings, DesignerSettingsKey::SMOOTH_RENDERING, false); restoreValue(settings, DesignerSettingsKey::SHOW_DEBUG_SETTINGS, false); - restoreValue(settings, DesignerSettingsKey::OLD_STATES_EDITOR, false); restoreValue(settings, DesignerSettingsKey::EDITOR_ZOOM_FACTOR, 1.0); restoreValue(settings, DesignerSettingsKey::ACTIONS_MERGE_TEMPLATE_ENABLED, false); restoreValue(settings, DesignerSettingsKey::DOWNLOADABLE_BUNDLES_URL, "https://cdn.qt.io/designstudio/bundles"); + restoreValue(settings, DesignerSettingsKey::CONTENT_LIBRARY_NEW_FLAG_EXPIRATION_DAYS, 3); settings->endGroup(); settings->endGroup(); diff --git a/src/plugins/qmldesignerbase/utils/designersettings.h b/src/plugins/qmldesignerbase/utils/designersettings.h index 78b43705268..2e2e90c83f1 100644 --- a/src/plugins/qmldesignerbase/utils/designersettings.h +++ b/src/plugins/qmldesignerbase/utils/designersettings.h @@ -57,10 +57,10 @@ inline constexpr char ALWAYS_DESIGN_MODE[] = "AlwaysDesignMode"; inline constexpr char DISABLE_ITEM_LIBRARY_UPDATE_TIMER[] = "DisableItemLibraryUpdateTimer"; inline constexpr char ASK_BEFORE_DELETING_ASSET[] = "AskBeforeDeletingAsset"; inline constexpr char SMOOTH_RENDERING[] = "SmoothRendering"; -inline constexpr char OLD_STATES_EDITOR[] = "ForceOldStatesEditor"; inline constexpr char EDITOR_ZOOM_FACTOR[] = "EditorZoomFactor"; inline constexpr char ACTIONS_MERGE_TEMPLATE_ENABLED[] = "ActionsMergeTemplateEnabled"; inline constexpr char DOWNLOADABLE_BUNDLES_URL[] = "DownloadableBundlesLocation"; +inline constexpr char CONTENT_LIBRARY_NEW_FLAG_EXPIRATION_DAYS[] = "ContentLibraryNewFlagExpirationInDays"; } class QMLDESIGNERBASE_EXPORT DesignerSettings |