Skip to content

Commit 5767130

Browse files
dobeydobey
committed
Support building against Qt 6 or Qt 5
1 parent 58d930e commit 5767130

12 files changed

Lines changed: 89 additions & 62 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 63 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,52 @@ option(enable-glib "Build GLib support" ON)
1313

1414
option(enable-xcb "Compile with xcb support" ON)
1515
option(enable-wayland "Compile with support for wayland" ON)
16-
option(enable-qt5-inputcontext "Compile with Qt 5 input context" ON)
16+
option(enable-qt-inputcontext "Compile with Qt input context" ON)
1717

1818
option(enable-hwkeyboard "Enable support for the hardware keyboard" ON)
1919
option(enable-dbus-activation "Enable dbus activation support for maliit-server" OFF)
20+
option(with-qt6 "Built with Qt 6 instead of Qt 5" OFF)
2021

2122
# Install paths
2223
include(GNUInstallDirs)
2324

24-
if(NOT DEFINED QT5_PLUGINS_INSTALL_DIR)
25-
set(QT5_PLUGINS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/plugins" CACHE PATH
26-
"Installation directory for Qt 5 plugins [LIB_INSTALL_DIR/qt5/plugins]")
27-
endif()
28-
29-
if(NOT DEFINED QT5_MKSPECS_INSTALL_DIR)
30-
set(QT5_MKSPECS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/mkspecs" CACHE PATH
31-
"Installation directory for Qt 5 mkspecs files [LIB_INSTALL_DIR/qt5/mkspecs]")
32-
endif()
33-
3425
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
3526

3627
set(CMAKE_INCLUDE_CURRENT_DIR ON)
3728
set(CMAKE_AUTOMOC ON)
3829

3930
find_package(PkgConfig REQUIRED)
4031

41-
find_package(Qt5Core)
42-
find_package(Qt5DBus)
43-
find_package(Qt5Gui REQUIRED PRIVATE)
44-
find_package(Qt5Quick)
32+
if(with-qt6)
33+
find_package(Qt6 6.0 REQUIRED COMPONENTS Core DBus Gui Quick)
34+
endif()
35+
36+
if(Qt6_FOUND)
37+
set(QT_VERSION_MAJOR 6)
38+
else()
39+
find_package(Qt5 REQUIRED COMPONENTS Core DBus Gui Quick)
40+
set(QT_VERSION_MAJOR 5)
41+
endif()
42+
43+
if(NOT DEFINED QT_PLUGINS_INSTALL_DIR)
44+
set(QT_PLUGINS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/plugins" CACHE PATH
45+
"Installation directory for Qt ${QT_VERSION_MAJOR} plugins [LIB_INSTALL_DIR/qt${QT_VERSION_MAJOR}/plugins]")
46+
endif()
47+
48+
if(NOT DEFINED QT_MKSPECS_INSTALL_DIR)
49+
set(QT_MKSPECS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/mkspecs" CACHE PATH
50+
"Installation directory for Qt 5 mkspecs files [LIB_INSTALL_DIR/qt${QT_VERSION_MAJOR}/mkspecs]")
51+
endif()
4552

4653
if(enable-wayland)
54+
if (Qt6_FOUND)
55+
find_package(Qt6 REQUIRED COMPONENTS WaylandClient WaylandGlobalPrivate)
56+
else()
57+
find_package(Qt5 5.14 REQUIRED COMPONENTS WaylandClient XkbCommonSupport)
58+
endif()
4759
find_package(WaylandProtocols REQUIRED PRIVATE)
4860
find_package(QtWaylandScanner REQUIRED)
4961
find_package(Wayland REQUIRED)
50-
find_package(Qt5WaylandClient 5.14 REQUIRED PRIVATE)
51-
find_package(Qt5XkbCommonSupport REQUIRED PRIVATE)
5262
pkg_check_modules(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon)
5363
endif()
5464

@@ -59,7 +69,7 @@ add_library(maliit-common STATIC
5969
common/maliit/namespaceinternal.h
6070
common/maliit/settingdata.cpp
6171
common/maliit/settingdata.h)
62-
target_link_libraries(maliit-common Qt5::Core)
72+
target_link_libraries(maliit-common Qt${QT_VERSION_MAJOR}::Core)
6373
target_include_directories(maliit-common PUBLIC common)
6474

6575
set(CONNECTION_SOURCES
@@ -94,21 +104,33 @@ endif()
94104
set_source_files_properties(dbus_interfaces/minputmethodcontext1interface.xml dbus_interfaces/minputmethodserver1interface.xml
95105
PROPERTIES INCLUDE maliit/settingdata.h)
96106

107+
if (Qt6_FOUND)
108+
qt6_add_dbus_adaptor(CONNECTION_SOURCES dbus_interfaces/minputmethodcontext1interface.xml dbusserverconnection.h DBusServerConnection)
109+
qt6_add_dbus_adaptor(CONNECTION_SOURCES dbus_interfaces/minputmethodserver1interface.xml dbusinputcontextconnection.h DBusInputContextConnection)
110+
111+
qt6_add_dbus_interface(CONNECTION_SOURCES dbus_interfaces/minputmethodcontext1interface.xml minputmethodcontext1interface_interface)
112+
qt6_add_dbus_interface(CONNECTION_SOURCES dbus_interfaces/minputmethodserver1interface.xml minputmethodserver1interface_interface)
113+
else()
97114
qt5_add_dbus_adaptor(CONNECTION_SOURCES dbus_interfaces/minputmethodcontext1interface.xml dbusserverconnection.h DBusServerConnection)
98115
qt5_add_dbus_adaptor(CONNECTION_SOURCES dbus_interfaces/minputmethodserver1interface.xml dbusinputcontextconnection.h DBusInputContextConnection)
99116

100117
qt5_add_dbus_interface(CONNECTION_SOURCES dbus_interfaces/minputmethodcontext1interface.xml minputmethodcontext1interface_interface)
101118
qt5_add_dbus_interface(CONNECTION_SOURCES dbus_interfaces/minputmethodserver1interface.xml minputmethodserver1interface_interface)
119+
endif()
102120

103121
add_library(maliit-connection STATIC ${CONNECTION_SOURCES})
104-
target_link_libraries(maliit-connection Qt5::Core Qt5::DBus Qt5::Gui maliit-common)
122+
target_link_libraries(maliit-connection Qt::Core Qt::DBus Qt::Gui maliit-common)
105123
if(enable-wayland)
106124
target_link_libraries(maliit-connection Wayland::Client PkgConfig::XKBCOMMON)
107-
target_include_directories(maliit-connection PRIVATE ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS})
125+
if (Qt6_FOUND)
126+
target_include_directories(maliit-connection PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
127+
else()
128+
target_include_directories(maliit-connection PRIVATE ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
129+
endif()
108130
endif()
109131
target_include_directories(maliit-connection PUBLIC connection)
110132

111-
include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
133+
include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
112134

113135
set(PLUGINS_SOURCES
114136
src/maliit/plugins/abstractinputmethod.cpp
@@ -213,7 +235,7 @@ endif()
213235

214236
add_library(maliit-plugins SHARED ${PLUGINS_SOURCES} ${PLUGINS_HEADER})
215237
target_link_libraries(maliit-plugins PRIVATE maliit-common maliit-connection ${PLUGINS_LIBRARIES})
216-
target_link_libraries(maliit-plugins PUBLIC Qt5::Core Qt5::Gui Qt5::Quick)
238+
target_link_libraries(maliit-plugins PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Quick)
217239
target_include_directories(maliit-plugins PRIVATE ${PLUGINS_INCLUDE_DIRS})
218240

219241
set_target_properties(maliit-plugins PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR}
@@ -288,14 +310,14 @@ add_definitions(-DMALIIT_FRAMEWORK_USE_INTERNAL_API
288310
add_executable(maliit-server passthroughserver/main.cpp)
289311
target_link_libraries(maliit-server maliit-plugins maliit-connection)
290312

291-
if(enable-qt5-inputcontext)
313+
if(enable-qt-inputcontext)
292314
set(INPUT_CONTEXT_SOURCES
293315
input-context/main.cpp
294316
input-context/minputcontext.cpp
295317
input-context/minputcontext.h)
296318

297319
add_library(maliitplatforminputcontextplugin MODULE ${INPUT_CONTEXT_SOURCES})
298-
target_link_libraries(maliitplatforminputcontextplugin maliit-connection Qt5::Quick)
320+
target_link_libraries(maliitplatforminputcontextplugin maliit-connection Qt${QT_VERSION_MAJOR}::Quick)
299321
endif()
300322

301323
if(enable-wayland)
@@ -307,31 +329,36 @@ if(enable-wayland)
307329
ecm_add_qtwayland_client_protocol(INPUT_PANEL_SHELL_SOURCES PROTOCOL ${WAYLANDPROTOCOLS_PATH}/unstable/input-method/input-method-unstable-v1.xml BASENAME input-method-unstable-v1)
308330

309331
add_library(inputpanel-shell MODULE ${INPUT_PANEL_SHELL_SOURCES})
310-
target_link_libraries(inputpanel-shell Qt5::WaylandClient PkgConfig::XKBCOMMON Wayland::Client)
311-
target_include_directories(inputpanel-shell PRIVATE ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS} ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS})
332+
target_link_libraries(inputpanel-shell Qt::WaylandClient PkgConfig::XKBCOMMON Wayland::Client)
333+
if (Qt6_FOUND)
334+
target_link_libraries(inputpanel-shell Qt::WaylandGlobalPrivate)
335+
target_include_directories(inputpanel-shell PRIVATE ${Qt6WaylandClient_PRIVATE_INCLUDE_DIRS} ${Qt6WaylandGlobalPrivate_PRIVATE_INCLUDE_DIRS} ${Qt6XkbCommonSupport_PRIVATE_INCLUDE_DIRS})
336+
else()
337+
target_include_directories(inputpanel-shell PRIVATE ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS} ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS})
338+
endif()
312339
endif()
313340

314341
if(enable-examples)
315-
find_package(Qt5Widgets)
342+
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
316343
add_executable(maliit-exampleapp-plainqt
317344
examples/apps/plainqt/mainwindow.cpp
318345
examples/apps/plainqt/mainwindow.h
319346
examples/apps/plainqt/plainqt.cpp)
320-
target_link_libraries(maliit-exampleapp-plainqt Qt5::Gui Qt5::Widgets)
347+
target_link_libraries(maliit-exampleapp-plainqt Qt::Gui Qt::Widgets)
321348

322349
add_library(cxxhelloworldplugin MODULE
323350
examples/plugins/cxx/helloworld/helloworldinputmethod.cpp
324351
examples/plugins/cxx/helloworld/helloworldinputmethod.h
325352
examples/plugins/cxx/helloworld/helloworldplugin.cpp
326353
examples/plugins/cxx/helloworld/helloworldplugin.h)
327-
target_link_libraries(cxxhelloworldplugin maliit-plugins Qt5::Widgets)
354+
target_link_libraries(cxxhelloworldplugin maliit-plugins Qt::Widgets)
328355

329356
add_library(cxxoverrideplugin MODULE
330357
examples/plugins/cxx/override/overrideinputmethod.cpp
331358
examples/plugins/cxx/override/overrideinputmethod.h
332359
examples/plugins/cxx/override/overrideplugin.cpp
333360
examples/plugins/cxx/override/overrideplugin.h)
334-
target_link_libraries(cxxoverrideplugin maliit-plugins Qt5::Widgets)
361+
target_link_libraries(cxxoverrideplugin maliit-plugins Qt::Widgets)
335362
endif()
336363

337364
# Documentation
@@ -395,7 +422,7 @@ install(FILES src/mimserver.h
395422
install(FILES ${CMAKE_BINARY_DIR}/maliit-framework.pc ${CMAKE_BINARY_DIR}/maliit-plugins.pc ${CMAKE_BINARY_DIR}/maliit-server.pc
396423
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
397424
install(FILES ${CMAKE_BINARY_DIR}/maliit-framework.prf ${CMAKE_BINARY_DIR}/maliit-plugins.prf ${CMAKE_BINARY_DIR}/maliit-defines.prf
398-
DESTINATION ${QT5_MKSPECS_INSTALL_DIR}/features)
425+
DESTINATION ${QT_MKSPECS_INSTALL_DIR}/features)
399426

400427
install(EXPORT MaliitPluginsTargets FILE MaliitPluginsTargets.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/MaliitPlugins)
401428
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/MaliitPluginsConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/MaliitPluginsConfigVersion.cmake
@@ -432,12 +459,12 @@ if(enable-glib)
432459
endif()
433460

434461
if(enable-qt5-inputcontext)
435-
install(TARGETS maliitplatforminputcontextplugin LIBRARY DESTINATION ${QT5_PLUGINS_INSTALL_DIR}/platforminputcontexts)
462+
install(TARGETS maliitplatforminputcontextplugin LIBRARY DESTINATION ${QT_PLUGINS_INSTALL_DIR}/platforminputcontexts)
436463
endif()
437464

438465
if(enable-wayland)
439466
install(TARGETS inputpanel-shell
440-
LIBRARY DESTINATION ${QT5_PLUGINS_INSTALL_DIR}/wayland-shell-integration)
467+
LIBRARY DESTINATION ${QT_PLUGINS_INSTALL_DIR}/wayland-shell-integration)
441468
endif()
442469

443470
if(enable-dbus-activation)
@@ -456,7 +483,7 @@ endif()
456483
if(enable-tests)
457484
enable_testing()
458485

459-
find_package(Qt5Test)
486+
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test)
460487

461488
set(TEST_PLUGINS_DIR ${CMAKE_BINARY_DIR}/tests/plugins)
462489

@@ -497,7 +524,7 @@ if(enable-tests)
497524
tests/utils/core-utils.h
498525
tests/utils/gui-utils.cpp
499526
tests/utils/gui-utils.h)
500-
target_link_libraries(test-utils PUBLIC Qt5::Core Qt5::Gui Qt5::Test maliit-connection)
527+
target_link_libraries(test-utils PUBLIC Qt::Core Qt::Gui Qt::Test maliit-connection)
501528
target_include_directories(test-utils INTERFACE tests/utils)
502529
target_compile_definitions(test-utils PUBLIC
503530
-DMALIIT_TEST_PLUGINS_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/maliit-framework-tests/plugins"
@@ -508,7 +535,7 @@ if(enable-tests)
508535
tests/stubs/mkeyboardstatetracker_stub.h
509536
tests/stubs/fakeproperty.cpp
510537
tests/stubs/fakeproperty.h)
511-
target_link_libraries(test-stubs PUBLIC Qt5::Core)
538+
target_link_libraries(test-stubs PUBLIC Qt::Core)
512539
target_include_directories(test-stubs INTERFACE tests/stubs)
513540

514541
function(create_test name)

‎connection/mimserverconnection.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#define MIMSERVERCONNECTION_H
1616

1717
#include <maliit/namespace.h>
18+
#include <maliit/settingdata.h>
1819

1920
#include <QtCore>
2021

‎connection/waylandinputmethodconnection.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -338,15 +338,15 @@ void WaylandInputMethodConnection::sendPreeditString(const QString &string,
338338

339339
if (replace_length > 0) {
340340
int cursor = widgetState().value(CursorPositionAttribute).toInt();
341-
uint32_t index = string.midRef(qMin(cursor + replace_start, cursor), qAbs(replace_start)).toUtf8().size();
342-
uint32_t length = string.midRef(cursor + replace_start, replace_length).toUtf8().size();
341+
uint32_t index = string.mid(qMin(cursor + replace_start, cursor), qAbs(replace_start)).toUtf8().size();
342+
uint32_t length = string.mid(cursor + replace_start, replace_length).toUtf8().size();
343343
d->context()->delete_surrounding_text(index, length);
344344
}
345345

346346
Q_FOREACH (const Maliit::PreeditTextFormat& format, preedit_formats) {
347347
QtWayland::zwp_text_input_v1::preedit_style style = preeditStyleFromMaliit(format.preeditFace);
348-
uint32_t index = string.leftRef(format.start).toUtf8().size();
349-
uint32_t length = string.leftRef(format.start + format.length).toUtf8().size() - index;
348+
uint32_t index = string.left(format.start).toUtf8().size();
349+
uint32_t length = string.left(format.start + format.length).toUtf8().size() - index;
350350
qCDebug(lcWaylandConnection) << Q_FUNC_INFO << "preedit_styling" << index << length;
351351
d->context()->preedit_styling(index, length, style);
352352
}
@@ -356,8 +356,8 @@ void WaylandInputMethodConnection::sendPreeditString(const QString &string,
356356
cursor_pos = string.size() + 1 - cursor_pos;
357357
}
358358

359-
qCDebug(lcWaylandConnection) << Q_FUNC_INFO << "preedit_cursor" << string.leftRef(cursor_pos).toUtf8().size();
360-
d->context()->preedit_cursor(string.leftRef(cursor_pos).toUtf8().size());
359+
qCDebug(lcWaylandConnection) << Q_FUNC_INFO << "preedit_cursor" << string.left(cursor_pos).toUtf8().size();
360+
d->context()->preedit_cursor(string.left(cursor_pos).toUtf8().size());
361361
qCDebug(lcWaylandConnection) << Q_FUNC_INFO << "preedit_string" << string;
362362
d->context()->preedit_string(d->context()->serial(), string, string);
363363
}
@@ -384,12 +384,12 @@ void WaylandInputMethodConnection::sendCommitString(const QString &string,
384384

385385
if (replace_length > 0) {
386386
int cursor = widgetState().value(CursorPositionAttribute).toInt();
387-
uint32_t index = string.midRef(qMin(cursor + replace_start, cursor), qAbs(replace_start)).toUtf8().size();
388-
uint32_t length = string.midRef(cursor + replace_start, replace_length).toUtf8().size();
387+
uint32_t index = string.mid(qMin(cursor + replace_start, cursor), qAbs(replace_start)).toUtf8().size();
388+
uint32_t length = string.mid(cursor + replace_start, replace_length).toUtf8().size();
389389
d->context()->delete_surrounding_text(index, length);
390390
}
391391

392-
cursor_pos = string.leftRef(cursor_pos).toUtf8().size();
392+
cursor_pos = string.left(cursor_pos).toUtf8().size();
393393
d->context()->cursor_position(cursor_pos, cursor_pos);
394394
d->context()->commit_string(d->context()->serial(), string);
395395
}
@@ -470,8 +470,8 @@ void WaylandInputMethodConnection::setSelection(int start, int length)
470470
return;
471471

472472
QString surrounding = widgetState().value(SurroundingTextAttribute).toString();
473-
uint32_t index(surrounding.leftRef(start + length).toUtf8().size());
474-
uint32_t anchor(surrounding.leftRef(start).toUtf8().size());
473+
uint32_t index(surrounding.left(start + length).toUtf8().size());
474+
uint32_t anchor(surrounding.left(start).toUtf8().size());
475475

476476
d->context()->cursor_position(index, anchor);
477477
d->context()->commit_string(d->context()->serial(), QString());

‎examples/plugins/cxx/helloworld/helloworldinputmethod.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include <maliit/plugins/abstractinputmethodhost.h>
1717

1818
#include <QDebug>
19-
#include <QApplication>
20-
#include <QDesktopWidget>
19+
#include <QGuiApplication>
20+
#include <QScreen>
2121

2222
namespace {
2323

@@ -89,7 +89,7 @@ void HelloWorldInputMethod::show()
8989
}
9090

9191
// Set size of our container to screen size
92-
const QSize screenSize = QApplication::desktop()->screenGeometry().size();
92+
const QSize screenSize = QGuiApplication::primaryScreen()->size();
9393
mainWidget->parentWidget()->resize(screenSize);
9494

9595
// Set size of the input method

‎examples/plugins/cxx/override/overrideinputmethod.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include <maliit/plugins/abstractinputmethodhost.h>
1717

1818
#include <QDebug>
19-
#include <QApplication>
20-
#include <QDesktopWidget>
19+
#include <QGuiApplication>
20+
#include <QScreen>
2121
#include <QKeyEvent>
2222

2323
namespace {
@@ -81,7 +81,7 @@ void OverrideInputMethod::show()
8181
}
8282

8383
// Set size of the input method
84-
const QSize &screenSize = QApplication::desktop()->screenGeometry().size();
84+
const QSize &screenSize = QGuiApplication::primaryScreen()->size();
8585
const QSize size(screenSize.width() - 200, 200);
8686

8787
surface->setGeometry(QRect(QPoint((screenSize.width() - size.width()) / 2,

‎input-context/minputcontext.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ void MInputContext::onInvokeAction(const QString &action, const QKeySequence &se
624624
const int modifiers = sequence[i] & AllModifiers;
625625
QString text("");
626626
if (modifiers == Qt::NoModifier || modifiers == Qt::ShiftModifier) {
627-
text = QString(key);
627+
text = QString(QChar::fromLatin1(key));
628628
}
629629
keyEvent(QEvent::KeyPress, key, modifiers, text, false, 1);
630630
keyEvent(QEvent::KeyRelease, key, modifiers, text, false, 1);

‎src/msharedattributeextensionmanager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ MSharedAttributeExtensionManager::~MSharedAttributeExtensionManager()
3939
void MSharedAttributeExtensionManager::registerPluginSetting(const QString &fullName, Maliit::SettingEntryType type,
4040
QVariantMap attributes)
4141
{
42-
QString key = fullName.section(1, -1);
42+
QString key = fullName.section(QChar(), 0);
4343
QSharedPointer<MSharedAttributeExtensionManagerPluginSetting> value(new MSharedAttributeExtensionManagerPluginSetting(key, type, attributes));
4444

4545
sharedAttributeExtensions[key] = value;

‎src/quick/inputmethodquick.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <maliit/plugins/abstractinputmethod.h>
1818
#include <maliit/plugins/keyoverride.h>
19+
#include "keyoverridequick.h"
1920
#include "maliitquick.h"
2021

2122
#include <QEvent>

‎tests/ft_mimpluginmanager/ft_mimpluginmanager.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <unknownplatform.h>
1616

1717
#include <QProcess>
18-
#include <QRegExp>
1918
#include <QGuiApplication>
2019
#include <QPointer>
2120

‎tests/ut_mimpluginmanager/ut_mimpluginmanager.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "core-utils.h"
1212

1313
#include <QProcess>
14-
#include <QRegExp>
1514
#include <QCoreApplication>
1615
#include <QPointer>
1716
#include <QTimer>

0 commit comments

Comments
 (0)