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

Qt6 #11

Merged
merged 10 commits into from Nov 24, 2021
Merged

Qt6 #11

merged 10 commits into from Nov 24, 2021

Conversation

jdupak
Copy link
Collaborator

@jdupak jdupak commented Nov 24, 2021

Resolves #3

TheEdward162 and others added 10 commits November 24, 2021 10:09
ported from QtMips by Jakub Dupak

the exact changes are:
* Assigning an int to QChar fails to compile due to type ambiguity. Changed occurences to either assign uchar or to use the default constructor.
* QLineF::intersect replaced by QLineF::intersects
* QTableView::viewOptions replaced by QTableView::initViewItemOption with a different interface - covered by preprocessor #if check
* QFontMetrics::width replaced by QFontMetrics::horizontalAdvance
* QFileDialog::setFileMode(QFileDialog::DirectoryOnly) replaced by QFileDialog::setFileMode(QFileDialog::Directory) and QFileDialog::setOption(QFileDialog::ShowDirsOnly, true)
* QLayout::margin replaced by QLayout::getContentsMargins
* Multiple calls to QString(int) replaced by QString::number(int) (I belive this was a bug in the original implementation and was uncovered thanks to the update)
	- This is probably the same problem as the one that popped up in the first change (QChar), not sure why it didn't complain sooner
* There is a problem with Offset type not being the same size as size_t on macos, so a static_cast<size_t>(Offset) was added to fix the warning
…older.

Ported from QtMips by Jakub Dupak.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Ported from QtMips by Jakub Dupak.

+ horizontalAdvance polyfill

Tested for qt5.9.5 and qt6.2.1 on linux-gcc64.
Ported from QtMips by Jakub Dupak.
Ported from QtMips by Jakub Dupak.
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.

Qt6 support
3 participants