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

Load stylesheets properly when in AppImage or make install #4364

Merged
merged 2 commits into from
Apr 2, 2018

Conversation

hcorion
Copy link
Member

@hcorion hcorion commented Mar 31, 2018

-Wno-invalid-pch
was added because it was spammed constantly by gcc on Arch Linux.
-Wno-unused-command-line-argument
was added because it was occasionally spammed, during the build.

@Megamouse
Copy link
Contributor

If it works then it should be fine

@hcorion
Copy link
Member Author

hcorion commented Mar 31, 2018

Yes, it works

for (const QFileInfo &entry : linux_entries)
{
res.append(entry.baseName());
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I just noticed these code blocks were already implemented as a reuseable function in gui::utils::get_dir_entries in qt_utils.cpp

you might just use: res.append(gui::utils::get_dir_entries(dir, nameFilter));

same goes for the guiconfigs part above.

(If it makes sense to do that)

Copy link
Member Author

Choose a reason for hiding this comment

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

Adressed

Copy link
Contributor

@Megamouse Megamouse left a comment

Choose a reason for hiding this comment

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

just so neko no mergerino

res.removeDuplicates();
#endif
res.sort(Qt::CaseInsensitive);

Copy link
Contributor

Choose a reason for hiding this comment

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

are these 4 lines of space indentations (244-247) the unwanted abomination I was talking about?

is this april fools?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not seeing them. Maybe just April Fools on your end?

Copy link
Member Author

Choose a reason for hiding this comment

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

oh wait, nvm, I dunno what happened there.

@hcorion
Copy link
Member Author

hcorion commented Apr 2, 2018

@Nekotekina I've taken BSDs into account, ready for merge?

@Nekotekina Nekotekina merged commit b0352d6 into RPCS3:master Apr 2, 2018
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.

None yet

3 participants