Add support for Qt5 beta2 to Qt5 immodule. #20
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* scm/trycode.scm - (trycode-rule): Update: add 4 kanji.
* scm/trycode.scm
- (trycode-rule): Comment out reserved key sequences for commands
to simplify help and for performance of bushu conversion.
* qt4/candwin/candidatewindow.cpp
- (CandidateWindow::CandidateWindow):
Replace setResizeMode() with setSectionResizeMode()
* qt4/candwin/ximcandidatewindow.cpp
- (XimCandidateWindow::XimCandidateWindow): Ditto.
* qt4/chardict/chargridview.cpp
- (CharGridView::CharGridView, CharGridView::setCharacters): Ditto.
* qt4/pref/customwidgets.cpp
- (TableEditForm::TableEditForm): Ditto.
* qt4/candwin/ximcandidatewindow.cpp
- (XimCandidateWindow::activateCand,
XimCandidateWindow::setPageCandidates):
Replace QString::toAscii() with QString::toLatin1()
because Qt5 doesn't have QString::toAscii().
QString::toAscii() does the same as QString::toLatin1()
because we don't call QTextCodec::setCodecForCStrings().
* qt4/chardict/unicodeviewwidget.cpp
- (UnicodeViewWidget::setupWidgets): Ditto.
* qt4/pref/customwidgets.cpp
- (CustomKeyEdit::slotKeyButtonClicked): Ditto.
* qt4/pref/qt4.cpp
- (GroupPageWidget::setupWidgets): Ditto.
* qt4/switcher/qt4.cpp
- (UimImSwitcher::slotStdinActivated): Ditto.
* qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::slotStdinActivated,
QHelperPopupMenu::slotMenuActivated): Ditto.
* qt4/immodule/qtextutil.cpp - Apply cosmetic changes in including.
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::createCandidateWindow):
Define a new function.
* qt5/immodule/quimplatforminputcontext.h
- (QUimPlatformInputContext::createCandidateWindow):
Declare a new function.
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::QUimPlatformInputContext):
Use QUimPlatformInputContext::createCandidateWindow().
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::saveContext):
Define this new function.
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::restoreContext):
Define this new function.
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::getPreeditCursorPosition):
Define this new function.
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::switch_app_global_im):
Define this new function.
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::switch_system_global_im):
Define this new function.
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::updateStyle):
Define this new function.
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::QUimPlatformInputContext):
Remove a connection.
- (QUimPlatformInputContext::slotInputItemChanged):
Replace with QUimPlatformInputContext::setFocusObject()
because QInputMethod::inputeItem() doesn't exist in Qt5 beta2.
* qt5/immodule/quimplatforminputcontext.h
- (QUimPlatformInputContext::slotInputItemChanged):
Remove this function.
- (QUimPlatformInputContext::setFocusObject):
Declare this new function.
* qt4/immodule/qhelpermanager.cpp
- (QUimHelperManager::parseHelperStr):
Replace QString::toAscii() with QString::toLatin1()
because QString::toAscii() doesn't exist in Qt5 beta2.
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::filterEvent): Ditto.
* qt5/immodule/quimplatforminputcontext.cpp
- (getUserDefinedColor):
Replace QString::fromAscii() with QString::fromLatin1()
because QString::fromAscii() doesn't exist in Qt5 beta2.
* qt4/immodule/plugin.cpp * qt4/immodule/plugin.h * qt5/immodule/quimplatforminputcontext.h - Change paths of header files.
* qt4/immodule/plugin.cpp - Undefine CursorShape for Qt5 to make the codes compilable.
* qt5/immodule/quimplatforminputcontext.cpp
- (QUimPlatformInputContext::commitString,
QUimPlatformInputContext::updatePreedit):
Replace qApp->inputMethod()->inputItem() with qApp->focusObject()
because QInputMethod::inputItem() doesn't exist in Qt5 beta2.
* qt5/immodule/.qmake.conf - Add this new file. qmake requires this file. * qt5/immodule/quimplatforminputcontextplugin.pro.in - (PLUGIN_TYPE): Define this variable. - (QT): Replace platformsupport-private with gui-private.
mnogu
added a commit
that referenced
this pull request
Nov 27, 2012
Add support for Qt5 beta2 to Qt5 immodule.
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
No description provided.