Wip Qt 6 port #337

gfgit · 2024-02-08T12:09:37Z

Depends on lxqt-build-tools#77

tsujan · 2024-02-08T12:23:31Z

Glad to see that you've participated in the Qt6 port.

stefonarch · 2024-02-08T13:52:48Z

Nice! Maybe you've seen already https://github.com/orgs/lxqt/projects/3/views/1

stefonarch · 2024-02-08T13:59:33Z

For testing purpose I've a KDE Neon developer edition in Vbox:

find_package(PolkitQt6-1 REQUIRED) # TODO: does not seem to be available yet

gfgit · 2024-02-08T15:46:35Z

Nice! I didn't notice. Now I've setup a GNOME Boxes VM with Neon Unstable which is a bit faster than VirtualBox.
Also there is X11 specific code about XScreenSaver and lock screen in general which I don't know how to port to Wayland. For now they are just skipped and a warning is emitted.
Are there any compositor-agnostic Wayland protocols about lockscreen?

tsujan · 2024-02-08T15:57:41Z

which I don't know how to port to Wayland.

Please don't include porting to Wayland in this PR, which is for porting to Qt6.

stefonarch · 2024-02-08T16:54:16Z

I forgot to mention that this Vbox with Neon already blocked twice here, just editing files.

Are there any compositor-agnostic Wayland protocols about lockscreen?

For the future: https://wayland.app/protocols/ext-session-lock-v1

gfgit · 2024-02-08T17:02:23Z

which I don't know how to port to Wayland.

Please don't include porting to Wayland in this PR, which is for porting to Qt6.

Yes of course, but at least a warning line so it's easier to find for later wayland port?

tsujan · 2024-02-08T17:17:55Z

at least a warning line so it's easier to find for later wayland port?

Right. My comment was just a general remark :) Otherwise, your work has always been clean.

stefonarch · 2024-02-08T18:12:40Z

Managed to compile it on Neon, after 2 blocks:

set(KF5_MINIMUM_VERSION "6.0.0") for some reason on Neon the package libkf6windowsystem-dev and related are something like v5.245
Cmake doesn't check for libxss-dev so if it's not installed it stops at 82% with error about missing scrnsaver.h

gfgit · 2024-02-08T18:47:08Z

Managed to compile it on Neon, after 2 blocks:

* set(KF5_MINIMUM_VERSION "6.0.0") for some reason on Neon the package` libkf6windowsystem-dev` and related are something like v5.245

* Cmake doesn't check for libxss-dev  so if it's not installed it stops at 82% with error about missing `scrnsaver.h`

Can we do something about this or is it just a Neon bug?

stefonarch · 2024-02-08T19:39:12Z

I've no idea if they will update to 6.* the package versions at release, just changed the version to 5.2 in CMakeList.txt.

stefonarch · 2024-02-08T21:51:59Z

Compiling I get

    -- Looking for IceConnectionNumber in ICE - found
CMake Error at /usr/local/share/cmake/lxqt2/lxqt2-config.cmake:59 (include):
  include could not find requested file:

    /usr/local/share/cmake/lxqt2/lxqt-targets.cmake
Call Stack (most recent call first):
  CMakeLists.txt:25 (find_package)

Changing to "lxqt2" at the end of lxqt-config.cmake.in solves:
include("${CMAKE_CURRENT_LIST_DIR}/lxqt2-targets.cmake")

But both apps I try (globalkeys and lxqt-about) don't find #include QDialog or QObject at some point.

gfgit · 2024-02-08T22:03:01Z

Changing to "lxqt2" at the end of lxqt-config.cmake.in solves:

Fixed with latest commit.

But both apps I try (globalkeys and lxqt-about) don't find #include QDialog or QObject at some point.

I get this error too but only some files of global-keys CMake project seems affected. Also auto completion and syntax highlighting in Qt Creator work only on some files which means it cannot parse include directives, in fact compilation fails in same places.

gfgit · 2024-02-08T22:05:19Z

More precisely I can build lxqt-globalkeys CMake target but not all target because it fails to build lxqt-globalkeysd

stefonarch · 2024-02-10T11:24:25Z

Actually the same here too: translations aren't build without changing prefix to *.ts files. I made a test with resetting all to "lxqt" everywhere and translations get installed and my strange errors about "QDialog not found" and else where gone too.

- Update project version and dependencies - Update generaded CMake config template

Q_PID is removed in Qt6

- TODO: check if new syntax is equivalent

In Qt6 QLibraryInfo::location() is deprecated

- Fix NET namespace

QLayout::setMargin() got removed in Qt6

- Use QNativeInterface::QX11Application - Emit warning on Wayland platform which is currently unimplemented

In Qt6 globalPos() is deprecated

- SingleApplication: exit() is static

Previously there was a link error when building `lxqt-panel` project. Also inline overload taking pointers.

stefonarch · 2024-02-21T13:16:46Z

Just drop this: there is no check for libxss-dev (package name in Neon), so compilation fails at 70%.

gfgit · 2024-02-21T13:59:03Z

What's the error?

tsujan · 2024-03-03T18:49:06Z

I took a quick look at the changes, and they seemed all good. Also, the code was compiled without problem under Manjaro Testing (+ KF6). Will read it again soon. Thanks!

tsujan · 2024-03-20T12:30:27Z

lxqtsettings.cpp

@@ -500,6 +501,10 @@ QString LXQtTheme::qss(const QString& module) const
 ************************************************/
 QString LXQtThemeData::loadQss(const QString& qssFile) const
 {
+    // TODO: original QRegExp, check new syntax and QRegExp::RegExp2 meaning
+    // QRegExp(QL1S("url.[ \\t\\s]*"), Qt::CaseInsensitive, QRegExp::RegExp2);
+    static QRegularExpression urlRegexp(QLatin1String("url.[ \\t\\s]*"), QRegularExpression::CaseInsensitiveOption);


static const?

Done. Could you confirm syntax?

It's OK, thanks.

gfgit added 15 commits February 10, 2024 15:42

WIP Qt6 port

abbd3bc

- Update project version and dependencies - Update generaded CMake config template

Replace qAsConst() with std::as_const

7b07e11

Replace Q_PID with qint64

bb4a75c

Q_PID is removed in Qt6

TODO: Port QRegExp to QRegularExpression

feacd10

- TODO: check if new syntax is equivalent

Use QLibraryInfo::path()

2693916

In Qt6 QLibraryInfo::location() is deprecated

SingleApplication: fix KWindowInfo include

7b70748

- Fix NET namespace

QWidget::enterEvent() now has QEnterEvent argument

d3b91d2

Use QLayout::setContentsMargins()

85a1e5d

QLayout::setMargin() got removed in Qt6

ScreenSaver: remove QX11Info

0f53b81

- Use QNativeInterface::QX11Application - Emit warning on Wayland platform which is currently unimplemented

Use QMouseEvent::globalPosition()

357be1e

In Qt6 globalPos() is deprecated

Signal connections: use context QObject

b18f6f6

- SingleApplication: exit() is static

PluginInfo: do not ignore QTranslator::load() return value

d75b20b

ConfigDialogPrivate: forward declare QWidget

947f659

PluginInfo: export QDebug operators

8b1c5cc

Previously there was a link error when building `lxqt-panel` project. Also inline overload taking pointers.

Remove "2" in lxqt-config.cmake.in

2d4830c

gfgit force-pushed the wip_qt6 branch from 255f6b5 to 2d4830c Compare February 14, 2024 08:36

This was referenced Feb 14, 2024

Wip Qt6 port lxqt/lxqt-globalkeys#278

Merged

WIP Qt6 port lxqt/lxqt-panel#2024

Merged

tsujan reviewed Mar 20, 2024

View reviewed changes

Fix const regexp. TODO squash with previous commit

276f5a0

tsujan marked this pull request as ready for review March 21, 2024 10:16

tsujan approved these changes Mar 21, 2024

View reviewed changes

tsujan merged commit 20e501b into lxqt:master Mar 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wip Qt 6 port #337

Wip Qt 6 port #337

gfgit commented Feb 8, 2024 •

edited

Loading

tsujan commented Feb 8, 2024

stefonarch commented Feb 8, 2024

stefonarch commented Feb 8, 2024

gfgit commented Feb 8, 2024

tsujan commented Feb 8, 2024

stefonarch commented Feb 8, 2024

gfgit commented Feb 8, 2024

tsujan commented Feb 8, 2024

stefonarch commented Feb 8, 2024 •

edited

Loading

gfgit commented Feb 8, 2024

stefonarch commented Feb 8, 2024

stefonarch commented Feb 8, 2024

gfgit commented Feb 8, 2024

gfgit commented Feb 8, 2024 •

edited

Loading

stefonarch commented Feb 10, 2024 •

edited

Loading

stefonarch commented Feb 21, 2024

gfgit commented Feb 21, 2024

tsujan commented Mar 3, 2024

tsujan Mar 20, 2024

gfgit Mar 20, 2024

tsujan Mar 20, 2024

Wip Qt 6 port #337

Wip Qt 6 port #337

Conversation

gfgit commented Feb 8, 2024 • edited Loading

tsujan commented Feb 8, 2024

stefonarch commented Feb 8, 2024

stefonarch commented Feb 8, 2024

gfgit commented Feb 8, 2024

tsujan commented Feb 8, 2024

stefonarch commented Feb 8, 2024

gfgit commented Feb 8, 2024

tsujan commented Feb 8, 2024

stefonarch commented Feb 8, 2024 • edited Loading

gfgit commented Feb 8, 2024

stefonarch commented Feb 8, 2024

stefonarch commented Feb 8, 2024

gfgit commented Feb 8, 2024

gfgit commented Feb 8, 2024 • edited Loading

stefonarch commented Feb 10, 2024 • edited Loading

stefonarch commented Feb 21, 2024

gfgit commented Feb 21, 2024

tsujan commented Mar 3, 2024

tsujan Mar 20, 2024

Choose a reason for hiding this comment

gfgit Mar 20, 2024

Choose a reason for hiding this comment

tsujan Mar 20, 2024

Choose a reason for hiding this comment

gfgit commented Feb 8, 2024 •

edited

Loading

stefonarch commented Feb 8, 2024 •

edited

Loading

gfgit commented Feb 8, 2024 •

edited

Loading

stefonarch commented Feb 10, 2024 •

edited

Loading