Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplicate orientation settings in the iOS export preset #48943

Merged

Conversation

Calinou
Copy link
Member

@Calinou Calinou commented May 21, 2021

3.x version of #48939 (backwards compatible).

The screen orientation is now sourced from the Project Settings like it is done for Android already.

See #45422.

@akien-mga
Copy link
Member

./platform/android/export/gradle_export_util.h: In function 'String _get_activity_tag(const Ref<EditorExportPreset>&)':
./platform/android/export/gradle_export_util.h:253:54: error: '_get_screen_orientation' was not declared in this scope
  253 |  String orientation = _get_android_orientation_label(_get_screen_orientation());
      |                                                      ^~~~~~~~~~~~~~~~~~~~~~~
scons: *** [platform/android/export/export.x11.opt.tools.64.o] Error 1
platform/iphone/export/export.cpp: In member function 'void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset>&, Vector<unsigned char>&, const EditorExportPlatformIOS::IOSConfigData&, bool)':
platform/iphone/export/export.cpp:496:27: error: 'class OS' has no member named 'get_orientation_from_string'; did you mean 'get_screen_orientation_from_string'?
  496 |      OS::get_singleton()->get_orientation_from_string(GLOBAL_GET("display/window/handheld/orientation"));
      |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                           get_screen_orientation_from_string

@Calinou Calinou force-pushed the screen-orientation-remove-ios-duplicate-3.x branch from b0b0c44 to 1a0a2cc Compare May 24, 2021 16:57
The screen orientation is now sourced from the Project Settings
like it is done for Android already.
@Calinou Calinou force-pushed the screen-orientation-remove-ios-duplicate-3.x branch from 1a0a2cc to 914b5dc Compare May 25, 2021 21:55
@akien-mga akien-mga requested a review from m4gr3d May 25, 2021 22:14
@akien-mga akien-mga merged commit 94b5a82 into godotengine:3.x May 25, 2021
@akien-mga
Copy link
Member

Thanks!

@akien-mga
Copy link
Member

Cherry-picked for 3.3.3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants