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

clean: delete most Qt5 & <=6.3 conditional compiled code (QT_VERSION_CHECK macro) #1950

Merged

Conversation

shenlebantongying
Copy link
Collaborator

I was just wanted to delete Qt5 branch code, but found Qt6≤3 branches aren't really useful either.

The hotkeywarpper.cc/hh aren't touched because I am not on windows/Linux as of now.

Plus minor #include cleanup.

Comment on lines -42 to -44
#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) || QT_VERSION > QT_VERSION_CHECK( 6, 3, 0 ) )
page->triggerAction( QWebEnginePage::InspectElement );
#endif
Copy link
Collaborator Author

@shenlebantongying shenlebantongying Nov 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only one with Qt>6.3 for some reason. The Qt6.2 also have it.

@@ -23,18 +19,7 @@ static QAudioFormat format( int sampleRate, int channelCount )

out.setSampleRate( sampleRate );
out.setChannelCount( channelCount );
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
out.setByteOrder( QAudioFormat::LittleEndian );
out.setCodec( QLatin1String( "audio/pcm" ) );
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shenlebantongying shenlebantongying changed the title clean: delete most Qt5 & <=6.3 conditional compiled code (QT_VERSION) clean: delete most Qt5 & <=6.3 conditional compiled code (QT_VERSION_CHECK macro) Nov 14, 2024
@shenlebantongying shenlebantongying merged commit beef6dd into xiaoyifang:staged Nov 14, 2024
7 checks passed
@shenlebantongying shenlebantongying deleted the clean/no-qt5-condi branch November 14, 2024 05:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant