Skip to content

update for qt6 #6

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

Open
jmlich wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update for qt6 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(ENABLE_X11)
add_definitions(-DHAVE_X11)
endif()

find_package(Qt5Gui REQUIRED)
find_package(Qt6Gui REQUIRED)
find_package(MaliitGLib REQUIRED)

if(ENABLE_GTK2)
Expand All @@ -36,7 +36,7 @@ if(ENABLE_GTK2)
gtk-input-context/client-gtk/qt-keysym-map.h)

add_library(im-maliit2 MODULE ${SOURCE_FILES})
target_link_libraries(im-maliit2 PRIVATE Gtk2::Gtk Qt5::Gui Maliit::GLib)
target_link_libraries(im-maliit2 PRIVATE Gtk2::Gtk Qt6::Gui Maliit::GLib)
set_property(TARGET im-maliit2 PROPERTY OUTPUT_NAME im-maliit)
set_property(TARGET im-maliit2 PROPERTY PREFIX "")
set_property(TARGET im-maliit2 PROPERTY LIBRARY_OUTPUT_DIRECTORY gtk-2.0)
Expand All @@ -59,7 +59,7 @@ if(ENABLE_GTK3)
gtk-input-context/client-gtk/qt-keysym-map.h)

add_library(im-maliit3 MODULE ${SOURCE_FILES})
target_link_libraries(im-maliit3 PRIVATE Gtk3::Gtk Qt5::Gui Maliit::GLib)
target_link_libraries(im-maliit3 PRIVATE Gtk3::Gtk Qt6::Gui Maliit::GLib)
set_property(TARGET im-maliit3 PROPERTY OUTPUT_NAME im-maliit)
set_property(TARGET im-maliit3 PROPERTY PREFIX "")
set_property(TARGET im-maliit3 PROPERTY LIBRARY_OUTPUT_DIRECTORY gtk-3.0)
Expand Down
2 changes: 1 addition & 1 deletion gtk-input-context/client-gtk/qt-keysym-map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ XKeySymToQTKey(uint keySym)
return keySym;
#else
if (keySym < 0x3000 )
return keySym | Qt::UNICODE_ACCEL;
return keySym;

for(i = 0; i < count; i++)
if(QtKeyXSymMaps[i].XKeySym == keySym)
Expand Down