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.

Sign up for GitHub

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

Jump to bottom

Qt 6 Building Porting #1770

Draft
wants to merge 45 commits into
base: master
Choose a base branch
from
Draft

Qt 6 Building Porting #1770

wants to merge 45 commits into from

Conversation

Chiitoo
Copy link
Contributor

@Chiitoo Chiitoo commented Jul 3, 2024

Builds and runs (no crashes so far!) with spell checking disabled, on Gentoo Linux with Qt 6.7.2.

Bunches to do still:

  • Clean up CMakeLists once decided if Qt 5 will be supported via the same codebase.
  • Some bits have been commented out, requiring more figuring out.

Chiitoo added 30 commits July 4, 2024 01:07
@Chiitoo
qt6: CMakeLists: hello qt6
ae254e4
@Chiitoo
qt6: remove instances of 'stream.setCodec("UTF-8");'
b2496e0 
Everything in Qt 6 is UTF-8.
@Chiitoo
qt6: QtCore/QTextCodec--
2859416
@Chiitoo
qt6: QtWidgets/QDesktopWidget--
009f15a
@Chiitoo
qt6: QNetworkConfigurationManager--
96caeb5 
- https://code.qt.io/cgit/qt/qtbase.git/commit/?h=6.7&id=fbebc93617d99d2bf8fed559f17dba8bed15a063
- https://code.qt.io/cgit/qt/qtbase.git/commit/?h=6.7&id=f59f67287fa17e8d4edf6a231c010f768d1b76e8
@Chiitoo
qt6: move 'QWebEngineCertificateError' to 'QtWebEngineCore'
003afce
@Chiitoo
qt6: move 'QWebEngineFullScreenRequest' to 'QtWebEngineCore'
51e7f18
@Chiitoo
qt6: move 'QtWebEngineWidgets' to 'QtWebEngineCore'
52d5a60
@Chiitoo
qt6: move 'QWebEngineDownloadItem' to 'QWebEngineDownloadRequest'
a17718a
@Chiitoo
qt6: move 'QActionGroup' to 'QtGui'
6e16db0
@Chiitoo
qt6: move 'QAction' to 'QtGui'
dee2ba6
@Chiitoo
qt6: move 'QFileSystemModel' to 'QtGui'
dc51978
@Chiitoo
qt6: move 'QShortcut' to 'QtGui'
88a49ce
@Chiitoo
qt6: 's/setMargin/setContentsMargins/'
c423396
@Chiitoo
qt6: 's/init()/initFrom()'
67371d5 
- https://code.qt.io/cgit/qt/qtbase.git/commit/?h=6.7&id=26a226630443a20bb2d3015431c019614e33a061
@Chiitoo
qt6: 's/QEvent/QEnterEvent/'
fd8329f
@Chiitoo
qt6: 's/TextColorRole/ForegroundRole'
64533e9 
- https://code.qt.io/cgit/qt/qtbase.git/commit/?h=6.7&id=e9bebc12812b5c50346952cd9128bdd08ddd0b9d
@Chiitoo
qt6: 's/toTime_t/toSecsSinceEpoch/'
f064354 
- https://code.qt.io/cgit/qt/qtbase.git/commit/?h=6.7&id=8c8eae279d57ff73b69620f5710b8290d6268051
@Chiitoo
qt6: 's/fromTime_t/fromSecsSinceEpoch'
c4434d5 
- https://code.qt.io/cgit/qt/qtbase.git/commit/?h=6.7&id=8c8eae279d57ff73b69620f5710b8290d6268051
@Chiitoo
qt6: 's/QFontMetrics::width/QFontMetrics::horizontalAdvance/'
71eba52 
- https://code.qt.io/cgit/qt/qtbase.git/commit/?h=6.7&id=ee2ad9df701b27790e2ab72e99111d255fde42ed
@Chiitoo
qt6: 's/QWebEngineDownloadItem/QWebEngineDownloadRequest/'
f2c67c9
@Chiitoo
qt6: 's/QWebEngineSettings::globalSettings/QWebEngineSettings::defaul…
1452efc 
…tSettings/'

- https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=6.7&id=8daefcfd8e1bf41ae4d06c7a79a526b81a78dc58
@Chiitoo
qt6: 's/QApplication::desktop()/QGuiApplication::primaryScreen()/'
7d7a005 
- https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=6.7&id=8daefcfd8e1bf41ae4d06c7a79a526b81a78dc58
@Chiitoo
qt6: 's/HighQualityAntialiasing/Antialiasing/'
2d8587a 
- https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=6.7&id=8daefcfd8e1bf41ae4d06c7a79a526b81a78dc58
@Chiitoo
qt6: 's/midRef/mid/'
efd96dd
@Chiitoo
qt6: 'FollowRedirectsAttribute' has been removed
25a8e3e
@Chiitoo
qt6: rename downloadrequest members
26e1596
@Chiitoo
qt6: use 'defaultProfile->settings' instead of 'defaultSettings'
034da23 
- https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=6.7&id=0870cc93ad3240f5898f231c8f8b8fd82035206d
@Chiitoo
qt6: include 'QtGui/QActionGroup'
e0ff535
@Chiitoo
qt6: include 'QtWebEngineCore/QWebEngineHttpRequest'
b0427aa
Chiitoo added 15 commits July 4, 2024 01:07
@Chiitoo
qt6: include 'QtCore/QFile'
324a094
@Chiitoo
qt6: 'topLevelDomain()' is no more; port to 'qIsEffectiveTLD()'?
183b3bc
@Chiitoo
qt6: call to member function 'insert' is ambiguous
106bca8
@Chiitoo
qt6: call to member function 'mapTo' is ambiguous
d5b51f1
@Chiitoo
qt6: chosen constructor is explicit in copy-initialization
bb30cc7
@Chiitoo
qt6: conversion from 'int' to 'QChar' is ambiguous
eb25add
@Chiitoo
qt6: invalid operands to binary expression
2b61918 
('const QFileInfo' and 'const QString'

in instantiation of function template specialization 'QListSpecialMethodsBase<QFileInfo>::contains<QString>' requested here
contains(m_sessionPath)
@Chiitoo
qt6: no matching member function for call to 'icon'
c256df3
@Chiitoo
qt6: no member named 'print' in 'Otter::QtWebEnginePage'
6997f0c
@Chiitoo
qt6: no type named 'PromiseType' in 'QtPrivate::ArgResolver<Otter::Ad…
1c6823a 
…blockContentFiltersProfile *>'
@Chiitoo
qt6: no viable conversion from 'QPixmap' to 'const QCursor'
45de1b3
@Chiitoo
qt6: non-virtual member function marked 'override' hides virtual memb…
29f0c30 
…er function
@Chiitoo
qt6: reference to non-static member function must be called; did you …
0aa337e 
…mean to call it with no arguments?
@Chiitoo
qt6: use of overloaded operator '!=' is ambiguous (with operand types…
6b46a75 
… 'QKeyCombination' and 'Qt::Key')
@Chiitoo
qt6: linktime undefined reference to `Otter::Utils::createLocale(QStr…
af2dab4 
…ing const&)'
@Emdek
Copy link
Member

Emdek commented Jul 5, 2024

@Chiitoo, these changes for the QtWebEngine seem to be the biggest, but not as big as expected.
The most annoying thing seem to be that codec change for the streams.

Chiitoo added a commit to Chiitoo/otter-browser that referenced this pull request Aug 7, 2024
@Chiitoo
core/ui: use 'mid' instead if 'midRef'
27e93b7 
Required for Qt 6, where 'midRef' has been removed from QString, and
'mid' can already be used with Qt 5.

Picked from: OtterBrowser#1770
Chiitoo added a commit to Chiitoo/otter-browser that referenced this pull request Aug 7, 2024
@Chiitoo
modules: use 'fromSecsSinceEpoch' instead of 'fromTime_t'
3ca6ff4 
Required for Qt 6, and 'fromTime_t' has become obsolete already
during Qt 5 times.

- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8c8eae279d5

Picked from: OtterBrowser#1770
@Chiitoo Chiitoo mentioned this pull request Aug 7, 2024
Merged
Emdek pushed a commit that referenced this pull request Aug 7, 2024
@Chiitoo @Emdek
core/ui: use 'mid' instead if 'midRef'
e963342 
Required for Qt 6, where 'midRef' has been removed from QString, and
'mid' can already be used with Qt 5.

Picked from: #1770
Emdek pushed a commit that referenced this pull request Aug 7, 2024
@Chiitoo @Emdek
modules: use 'fromSecsSinceEpoch' instead of 'fromTime_t'
60b64fd 
Required for Qt 6, and 'fromTime_t' has become obsolete already
during Qt 5 times.

- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=8c8eae279d5

Picked from: #1770
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Chiitoo @Emdek