Skip to content

Commit c1785e9

Browse files
committed
Merge pull request #107517 from kitbdev/fix-test-warning-linebreak-setting
Fix tests warning line break strictness project setting
2 parents 1132e39 + d9d1d25 commit c1785e9

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

main/main.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2637,9 +2637,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
26372637
}
26382638
}
26392639

2640-
GLOBAL_DEF_BASIC("internationalization/locale/include_text_server_data", false);
2641-
GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "internationalization/locale/line_breaking_strictness", PROPERTY_HINT_ENUM, "Auto,Loose,Normal,Strict"), 0);
2642-
26432640
OS::get_singleton()->_allow_hidpi = GLOBAL_DEF("display/window/dpi/allow_hidpi", true);
26442641
OS::get_singleton()->_allow_layered = GLOBAL_DEF_RST("display/window/per_pixel_transparency/allowed", false);
26452642

servers/text_server.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,6 +2357,8 @@ TextServer::TextServer() {
23572357
GLOBAL_DEF_RST("gui/theme/default_font_generate_mipmaps", false);
23582358

23592359
GLOBAL_DEF(PropertyInfo(Variant::INT, "gui/theme/lcd_subpixel_layout", PROPERTY_HINT_ENUM, "Disabled,Horizontal RGB,Horizontal BGR,Vertical RGB,Vertical BGR"), 1);
2360+
GLOBAL_DEF_BASIC("internationalization/locale/include_text_server_data", false);
2361+
GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "internationalization/locale/line_breaking_strictness", PROPERTY_HINT_ENUM, "Auto,Loose,Normal,Strict"), 0);
23602362

23612363
_init_diacritics_map();
23622364
}

0 commit comments

Comments
 (0)