Reviewing merge request #2288: fix compile error when linuxinput keyboard driver is compiled as plugin

When creating the driver instance two parameters are given to the
driver. But it accepts only the name of the device to be used.

This affects also the current 4.6.1 release of qt.

Steps to reproduce:

./configure -embedded -fast -plugin-kbd-linuxinput
<snip>
make
<snip>
make[3]: Entering directory `/mnt/space/qt/rk-qt-compile-error-fix/src/plugins/kbddrivers/linuxinput'
g++ -c -pipe -fno-exceptions -O2 -fvisibility=hidden -fvisibility-inlines-hidden -D_REENTRANT -Wall -W -fPIC -DQT_QWS_KBD_LINUXINPUT -DQT_NO_DEBUG -DQT_PLUGIN -DQT_GUI_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED -I../../../../mkspecs/linux-g++ -I. -I../../../../include/QtCore -I../../../../include/QtGui -I../../../../include -I.moc/release-shared-emb-x86_64 -o .obj/release-shared-emb-x86_64/main.o main.cpp
main.cpp: In member function ‘virtual QWSKeyboardHandler* QLinuxInputKbdDriver::create(const QString&, const QString&)’:
main.cpp:72: error: no matching function for call to ‘QWSLinuxInputKeyboardHandler::QWSLinuxInputKeyboardHandler(const QString&, const QString&)’
../../../../include/QtGui/../../src/gui/embedded/qkbdlinuxinput_qws.h:62: note: candidates are: QWSLinuxInputKeyboardHandler::QWSLinuxInputKeyboardHandler(const QString&)
../../../../include/QtGui/../../src/gui/embedded/qkbdlinuxinput_qws.h:60: note: QWSLinuxInputKeyboardHandler::QWSLinuxInputKeyboardHandler(const QWSLinuxInputKeyboardHandler&)
make[3]: *** [.obj/release-shared-emb-x86_64/main.o] Error 1

Commits that would be merged:

Version 2
  • Version 1
  • Version 2
  • 1969f1f
  • 8bf245c

    • fix compile error when linuxinput keyboard driver is compiled as plugin

Showing 1969f1f-8bf245c

Comments

→ State changed from New to Merged

Merged (fc58ceb0041626baa95d00ea)

avatar Olivier Goffart | 2010-02-08 08:45:00 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository