forked from osmocom/wireshark
24a364f762
Of course it still fails in the compile phase, but only for some
of the ui/qt/ files.
Wireshark with Qt5 still compiles and runs.
To do the build invoke cmake with the following settings added:
export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake
cmake -DUSE_qt6=ON ...
Independently of this patch there is lots of Qt-stuff in
CMakeLists.txt that needs review/cleanup:
- Some of the stuff can probably be solved in a less hacky way:
+ There seemed to be a way for QT6 to provide the required c++-standard,
but in the end I could not find it.
+ Once we have a working Qt6 codebase, we may get rid of the USE_qt6
flag and just test for Qt6Core first and if not present check for
Qt5Core.
- All comments that match /qt ?[4-6]/i need reviewing/cleaning up.
- The changes in this patch have been tested to work on all machines
that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only
the macos package selected, cmake 3.21.4)
Add ui/qt/qt6-migration-links.txt for some possibly helpful links
13 lines
481 B
Text
13 lines
481 B
Text
https://doc.qt.io/qt-5/qtmac-obsolete.html
|
|
https://doc.qt.io/qt-6/extras-changes-qt6.html
|
|
https://doc.qt.io/qt-6/modulechanges.html
|
|
https://doc.qt.io/qt-6/cmake-qt5-and-qt6-compatibility.html
|
|
https://www.qt.io/blog/porting-from-qt-5-to-qt-6-using-qt5compat-library
|
|
https://dangelog.wordpress.com/2012/04/07/qregularexpression/
|
|
https://doc.qt.io/qt-6/qtcore-changes-qt6.html#regular-expression-classes
|
|
|
|
|
|
https://doc.qt.io/qt-6/qtmodules.html
|
|
https://doc.qt.io/qt-6/whatsnew60.html
|
|
|