diff options
| author | jian liang <jianliang79@gmail.com> | 2012-09-10 12:39:45 +0800 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-10 10:26:43 +0200 |
| commit | 31223818b4b9dd4956ae4263d83720209b1631f6 (patch) | |
| tree | 9371668455cfa15bc600a9ebda3d9fb6feac9ea4 | |
| parent | 26ebb99a49a72e470aedf3b0a6d25fb0db5dc00c (diff) | |
| download | qtactiveqt-31223818b4b9dd4956ae4263d83720209b1631f6.tar.gz | |
Fix building of qtactiveqt
Use isEmpty() instead of (int)operator to get the first character of
QKeySequece object in qaxwidget.cpp since (int) operator has been
deprecated from 5.0
Change-Id: Ic2a8857b4d270dae5dcd7dbbe7e8f37b1c045f84
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| -rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index 9f720ef..c672fce 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -1268,7 +1268,7 @@ QMenu *QAxClientSite::generatePopup(HMENU subMenu, QWidget *parent) if (lastSep != -1) { QString keyString = text.right(text.length() - lastSep); accel = keyString; - if ((int)accel) + if (!accel.isEmpty()) text = text.left(lastSep); } @@ -1291,7 +1291,7 @@ QMenu *QAxClientSite::generatePopup(HMENU subMenu, QWidget *parent) } if (action) { - if (int(accel)) + if (!accel.isEmpty()) action->setShortcut(accel); if (!icon.isNull()) action->setIcon(icon); |