Initial port to Qt6 #77

luis-pereira · 2022-06-17T17:12:47Z

We intend to be able to have Qt5 lxqt-build-tools and Qt6 lxqt-build-tools
installed to the same prefix location.

Major changes:
* Package name is lxqt2-build-tools.
* CMake minimum required version is 3.16.0
* start script renamed to startlxqt2
* translation update script renamed to lxqt2-transupdate
* Qt5TanslataionLoader CMake modules renamed to Qt6TranslationLoader.
Qt6 support only. USE_QT5 option dropped.
* LXQT_LIBRARY_NAME set to lxqt2

stefonarch · 2022-06-18T10:51:04Z

As we have to live with those executables for some years - wouldn't lxqt6-foo be a more suitable naming scheme?

luis-pereira · 2022-07-06T15:48:10Z

we have to live with those executables for some years - wouldn't lxqt6-foo be a more suitable naming scheme?

The executable can stay lxqt (exception: maybe startlxqt2). But not the libraries. That's what KDE handles KF libraries,
It's odd jumping from lxqt1 to lxqt6. My proposition is that LXQt2 uses Qt6., LXQt3 -> Qt7

tsujan · 2022-07-06T17:51:35Z

It's odd jumping from lxqt1 to lxqt6

I agree.The names of executables shouldn't change; the Qt6 ones will replace those of Qt5.

tsujan · 2022-07-08T06:15:13Z

@luis-pereira

Something has changed about QT_INSTALL_CONFIGURATION. Here, with Qt 6.3.1, I get

$ qmake6 -query QT_INSTALL_CONFIGURATION
**Unknown**

While, for example, QT_INSTALL_BINS and QT_INSTALL_DATA are OK.

As a result:

CMake Warning at cmake/FindInstallConfigPath.cmake:37 (message):
  Failed call: /usr/lib/qt6/bin/qmake -query "QT_INSTALL_CONFIGURATION"
Call Stack (most recent call first):
  CMakeLists.txt:20 (include)


-- You can set it manually with -DLXQT_ETC_XDG_DIR=<value>
--
CMake Error at cmake/FindInstallConfigPath.cmake:39 (message):
  QMake call failed with return code: 101
Call Stack (most recent call first):
  CMakeLists.txt:20 (include)


-- Configuring incomplete, errors occurred!

EDIT: -DLXQT_ETC_XDG_DIR=/etc/xdg works, of course. But, IMHO, it shouldn't be needed.

tsujan · 2022-07-08T06:29:35Z

This is the output of qmake6 -query:

$ qmake6 -query
prefix:/tmp/compilation/install
QT_SYSROOT:
QT_INSTALL_PREFIX:/usr
QT_INSTALL_ARCHDATA:/usr/lib/qt6
QT_INSTALL_DATA:/usr/share/qt6
QT_INSTALL_DOCS:/usr/share/doc/qt6
QT_INSTALL_HEADERS:/usr/include/qt6
QT_INSTALL_LIBS:/usr/lib
QT_INSTALL_LIBEXECS:/usr/lib/qt6
QT_INSTALL_BINS:/usr/lib/qt6/bin
QT_INSTALL_TESTS:/usr/tests
QT_INSTALL_PLUGINS:/usr/lib/qt6/plugins
QT_INSTALL_QML:/usr/lib/qt6/qml
QT_INSTALL_TRANSLATIONS:/usr/share/qt6/translations
QT_INSTALL_CONFIGURATION:
QT_INSTALL_EXAMPLES:/usr/share/doc/qt6/examples
QT_INSTALL_DEMOS:/usr/share/doc/qt6/examples
QT_HOST_PREFIX:/usr
QT_HOST_DATA:/usr/lib/qt6
QT_HOST_BINS:/usr/lib/qt6/bin
QT_HOST_LIBEXECS:/usr/lib/qt6
QT_HOST_LIBS:/usr/lib
QMAKE_SPEC:linux-g++
QMAKE_XSPEC:linux-g++
QMAKE_VERSION:3.1
QT_VERSION:6.3.1

Unlike in Qt5, QT_INSTALL_CONFIGURATION isn't set.

tsujan · 2022-07-08T07:01:48Z

Maybe something likes this:

    if(return_code EQUAL 0)
        string(STRIP "${output}" output)
        file(TO_CMAKE_PATH "${output}" output_path)
    else()
        message(STATUS "Got nothing from: ${_qt_qmake_executable} -query \"${qt_variable}\". LXQT_ETC_XDG_DIR will be set to '/etc/xdg'")
        set(output_path "/etc/xdg")
    endif()

luis-pereira · 2022-07-08T11:00:02Z

@tsujan Tanks for taking the time to test it. I'm aware of that issue. It's a known fact.
QT_INSTALL_CONFIGURATION can be set with qmake6 -set QT_INSTALL_CONFIGURATION /etc/xdg.
I do agree with you proposed solution. That will be part of the next commits to this Draft PR.

startlxqt is renamed to startlxqt2. What's your view on that ?

tsujan · 2022-07-08T11:26:27Z

I'm aware of that issue. It's a known fact.

@luis-pereira, yes, I guessed that when I saw you'd checked the return code, but it was a surprise to me.

My point is only that, since it can fail, we might need to set /etc/xdg as the default value. #77 (comment) was just a suggestion.

startlxqt is renamed to startlxqt2. What's your view on that ?

Actually, I wanted to ask you about it. Since there will be only one LXQt session, IMHO, startlxqt should be kept as it is. Did you have a specific reason in mind for startlxqt2?

luis-pereira · 2022-07-08T21:03:34Z

I'm aware of that issue. It's a known fact.

@luis-pereira, yes, I guessed that when I saw you'd checked the return code, but it was a surprise to me.

My point is only that, since it can fail, we might need to set /etc/xdg as the default value. #77 (comment) was just a suggestion.

I understood the spirit of your suggestion.

Actually, I wanted to ask you about it. Since there will be only one LXQt session, IMHO, startlxqt should be kept as it is. Did you have a specific reason in mind for startlxqt2?

It was intended for the developers. It will not help that much. Keeping startlxqt

luis-pereira · 2022-07-15T13:13:39Z

@tsujan startlxqt2 was just referenced in comments.
What I actually renamed in code was the lxqt-transupdate to lxqt2-transupdate. It's not installed under the lxqt2-build-tools directory and it will collide with the one from lxqt-build-tools. Does it cause an issue ?

tsujan · 2022-07-15T13:38:21Z

Does it cause an issue ?

I don't see any problem. According to your logic, lxqt2-transupdate will be used by Qt6 apps of LXQt2; so, it's good.

tsujan · 2022-07-15T13:52:06Z

startlxqt2 was just referenced in comments.

Yes, I know. I just think we might use startlxqt with Qt6 (keeping its name seems more convenient to me). If so, the comment(s) could be confusing to code readers.

luis-pereira · 2022-07-15T14:59:32Z

Force pushing:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9e4b45..50f8aaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ include(cmake/modules/LXQtPreventInSourceBuilds.cmake)
 
 #-----------------------------------------------------------------------------
 # LXQT_DATA_DIR defaults to CMAKE_INSTALL_FULL_DATADIR. It's added to
-#   XDG_DATA_DIRS by the startlxqt2 script
+#   XDG_DATA_DIRS by the startlxqt script
 # Warning: Setting LXQT_DATA_DIR must be done after including GNUInstallDirs
 #-----------------------------------------------------------------------------
 if (NOT DEFINED LXQT_DATA_DIR)

tsujan · 2023-01-05T12:45:18Z

To restart the Qt6 port after LXQt 1.2.0, I set /etc/xdg as the default global config dir, removed conflicts, and rebased the branch.

Updated FindInstallConfigPath accordingly. QT_QMAKE_EXECUTABLE cached variable renamed to QUERY_EXECUTABLE. QT prefix removed to avoid clash with Qt CMake variables.

tsujan · 2023-06-30T13:19:52Z

CMakeLists.txt

@@ -30,7 +30,7 @@ if (NOT DEFINED LXQT_DATA_DIR)
    )
 endif()

-set(LXQT_LIBRARY_NAME "lxqt" CACHE STRING "lxqt")
+set(LXQT_LIBRARY_NAME "lxqt2" CACHE STRING "lxqt2")


@luis-pereira
I think this instance of lxqt could be kept as it was (no change to lxqt2). The components that can be installed in parallel with Qt5-based ones shouldn't be affected, and the other components shouldn't be installed in parallel. Therefore, for example, there's no reason to have different LXQT_TRANSLATIONS_DIR or LXQT_GRAPHICS_DIR folders.

Am I missing something?

I made some tests with globalshortcuts-wip_qt6:

translations will only be built and installed if for all *.ts and *.yaml files lxqt- prefix is renamed to lxqt2-.

If LXQT_LIBRARY_NAME "lxqt" is used translations are not loaded, they are looked for in /usr/share/lxqt2/translations by the applications.

So not sure what the best approach is - but renaming all files will break all weblate translations settings. Just not using any lxqt2- prefixes if port is finished?
@luis-pereira ?

We should try remove lxqt2 folder prefix and use plain lxqt and then try to build same library with both Qt6 and Qt5 and link some apps to either of them.
See if some files get overwritten or other kind of conflicts happen. This way you are sure there are no side effects.

redtide · 2023-07-10T12:31:01Z

I'm not sure if this is the right place but I tried to update lxqt-transupdate.
I'm not a shell script expert, so I'd appreciate some feedback on what's good, what should be changed and what's not.

This version:

uses functions instead global scope
removed QT_SELECT: IMO a translation update tool shouldn't touch, nor impose an env var like that
checks the qt version installed, by detecting the one in use using qmake and setting an array of supported versions (5 and 6)
let the user to pass the path of the source directory, to avoid to work on the wrong one and delete all translations
using printf instead echo as proposed in fix bashisms in lxqt-transupdate for better portability with non-bash #84

redtide · 2023-07-26T13:25:05Z

FTR: you can use the versionless commands to update translations, so it might work also with future Qt versions. I did a "version agnostic" of LXQtTranslateTs, though qt_create_translation is going to be deprecated.

cmake/modules/LXQtTranslateTs.cmake.in

See https://bugreports.qt.io/browse/QTBUG-95791

Instead of hardcoding the project name in several instances, use the project name variable.

CMake: test normal `lxqt` prefix

Reuse CMAKE_PROJECT_NAME

This has no effect on build itself, just for consistency

Remove "2" suffix from docstring

tsujan · 2024-03-03T18:58:58Z

@gfgit
Thanks for changing those two instances of lxqt2 back to lxqt!

We usually don't make changes in other devs' branches without their consent, but this one can be seen as an exception — it was needed.

tsujan · 2024-03-05T13:09:57Z

Any objection to merging? It's tested by several devs.

gfgit · 2024-03-05T15:15:39Z

None

tsujan · 2024-03-05T23:29:02Z

@gfgit
lxqt-build-tools uses QLibraryInfo::location, which is deprecated. Would you please fix that?

gfgit · 2024-03-07T09:41:01Z

See #93

luis-pereira mentioned this pull request Jun 17, 2022

Wip lxqt2 qt6 #73

Closed

luis-pereira requested a review from tsujan July 6, 2022 15:48

luis-pereira force-pushed the lxqt2-qt6 branch from 79022d3 to ffd23d0 Compare July 15, 2022 15:01

stefonarch mentioned this pull request Aug 1, 2022

There is no release qtilities/sddm-conf#20

Closed

tsujan mentioned this pull request Nov 16, 2022

Crash on opening folder with >1 .desktop files on wayland tsujan/FeatherPad#689

Closed

tsujan force-pushed the lxqt2-qt6 branch from 11bc89e to e2786d4 Compare January 5, 2023 12:41

tsujan mentioned this pull request Feb 5, 2023

Started Qt6 port lxqt/libfm-qt#778

Merged

Initial port to Qt6

d43c312

tsujan force-pushed the lxqt2-qt6 branch from 5f9e109 to d43c312 Compare April 15, 2023 18:04

Adds LXQtQueryQt module

cdf4eac

Updated FindInstallConfigPath accordingly. QT_QMAKE_EXECUTABLE cached variable renamed to QUERY_EXECUTABLE. QT prefix removed to avoid clash with Qt CMake variables.

tsujan reviewed Jun 30, 2023

View reviewed changes

Add CMake feature_summary info

880656b

stefonarch reviewed Feb 8, 2024

View reviewed changes

cmake/modules/LXQtTranslateTs.cmake.in Outdated Show resolved Hide resolved

Fix CMake export QTBUG-95791

1030716

See https://bugreports.qt.io/browse/QTBUG-95791

This was referenced Feb 9, 2024

Fix CMake export QTBUG-95791 #89

Merged

Wip Qt6 port lxqt/lxqt-globalkeys#278

Merged

tsujan mentioned this pull request Feb 9, 2024

Set "use wallpaper from theme" broken for local themes lxqt/lxqt-config#978

Closed

CMake: test normal lxqt prefix

728658d

yan12125 mentioned this pull request Feb 25, 2024

Build with Qt6 lxqt/qtermwidget#532

Merged

Reuse CMAKE_PROJECT_NAME

e7872c7

Instead of hardcoding the project name in several instances, use the project name variable.

This was referenced Mar 3, 2024

Wip Qt 6 port lxqt/liblxqt#337

Merged

Started Qt6 port lxqt/libqtxdg#272

Merged

WIP Qt6 port lxqt/lxqt-panel#2024

Merged

gfgit and others added 5 commits March 3, 2024 16:32

Merge pull request #91 from gfgit/lxqt2-qt6

9e80959

CMake: test normal `lxqt` prefix

Merge pull request #90 from romangg/project-name-var

6d14dcd

Reuse CMAKE_PROJECT_NAME

Remove also 2 suffix from docstring

73cf0bc

This has no effect on build itself, just for consistency

Merge branch 'lxqt:lxqt2-qt6' into lxqt2-qt6

6e3ae8b

Merge pull request #92 from gfgit/lxqt2-qt6

c85fada

Remove "2" suffix from docstring

tsujan marked this pull request as ready for review March 5, 2024 12:09

tsujan merged commit 86c3fb6 into master Mar 5, 2024

tsujan deleted the lxqt2-qt6 branch March 5, 2024 16:20

tsujan mentioned this pull request Mar 6, 2024

Qt6 port lxqt/qps#464

Merged

yan12125 mentioned this pull request Mar 24, 2024

Please don't release an alternative version #95

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial port to Qt6 #77

Initial port to Qt6 #77

luis-pereira commented Jun 17, 2022

stefonarch commented Jun 18, 2022

luis-pereira commented Jul 6, 2022

tsujan commented Jul 6, 2022

tsujan commented Jul 8, 2022 •

edited

Loading

tsujan commented Jul 8, 2022

tsujan commented Jul 8, 2022 •

edited

Loading

luis-pereira commented Jul 8, 2022

tsujan commented Jul 8, 2022 •

edited

Loading

luis-pereira commented Jul 8, 2022

luis-pereira commented Jul 15, 2022

tsujan commented Jul 15, 2022 •

edited

Loading

tsujan commented Jul 15, 2022

luis-pereira commented Jul 15, 2022

tsujan commented Jan 5, 2023

tsujan Jun 30, 2023

stefonarch Feb 10, 2024 •

edited

Loading

gfgit Feb 10, 2024 •

edited

Loading

redtide commented Jul 10, 2023 •

edited

Loading

redtide commented Jul 26, 2023 •

edited

Loading

tsujan commented Mar 3, 2024 •

edited

Loading

tsujan commented Mar 5, 2024

gfgit commented Mar 5, 2024

tsujan commented Mar 5, 2024

gfgit commented Mar 7, 2024

Initial port to Qt6 #77

Initial port to Qt6 #77

Conversation

luis-pereira commented Jun 17, 2022

stefonarch commented Jun 18, 2022

luis-pereira commented Jul 6, 2022

tsujan commented Jul 6, 2022

tsujan commented Jul 8, 2022 • edited Loading

tsujan commented Jul 8, 2022

tsujan commented Jul 8, 2022 • edited Loading

luis-pereira commented Jul 8, 2022

tsujan commented Jul 8, 2022 • edited Loading

luis-pereira commented Jul 8, 2022

luis-pereira commented Jul 15, 2022

tsujan commented Jul 15, 2022 • edited Loading

tsujan commented Jul 15, 2022

luis-pereira commented Jul 15, 2022

tsujan commented Jan 5, 2023

tsujan Jun 30, 2023

Choose a reason for hiding this comment

stefonarch Feb 10, 2024 • edited Loading

Choose a reason for hiding this comment

gfgit Feb 10, 2024 • edited Loading

Choose a reason for hiding this comment

redtide commented Jul 10, 2023 • edited Loading

redtide commented Jul 26, 2023 • edited Loading

tsujan commented Mar 3, 2024 • edited Loading

tsujan commented Mar 5, 2024

gfgit commented Mar 5, 2024

tsujan commented Mar 5, 2024

gfgit commented Mar 7, 2024

tsujan commented Jul 8, 2022 •

edited

Loading

tsujan commented Jul 8, 2022 •

edited

Loading

tsujan commented Jul 8, 2022 •

edited

Loading

tsujan commented Jul 15, 2022 •

edited

Loading

stefonarch Feb 10, 2024 •

edited

Loading

gfgit Feb 10, 2024 •

edited

Loading

redtide commented Jul 10, 2023 •

edited

Loading

redtide commented Jul 26, 2023 •

edited

Loading

tsujan commented Mar 3, 2024 •

edited

Loading