diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 04:41:03 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 04:41:03 (GMT) |
commit | b91d336573c9bfb2e7c93286a8e0b36e742bd775 (patch) | |
tree | d498e4463479ee8e5656a12e7decc2e45045309d /src/gui/kernel | |
parent | 6c459aaa628642e86f7f4b56bb35017a3fb06a35 (diff) | |
parent | 9fbbd3146c42869d56da8c82501be1e6a6595f36 (diff) | |
download | Qt-b91d336573c9bfb2e7c93286a8e0b36e742bd775.zip Qt-b91d336573c9bfb2e7c93286a8e0b36e742bd775.tar.gz Qt-b91d336573c9bfb2e7c93286a8e0b36e742bd775.tar.bz2 |
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (280 commits)
Always use display() in QEglContext, so initialization can occur
Fixed a regression in dockwidgets that would jump when toplevel resized
Stabilize QGraphicsView benchmarks.
Remove platform dependent code from QGraphicsView benchmark.
Compiler warnings in QGraphicsView benchmark.
Stabilize QGraphicsScene benchmarks.
Compiler warning, unusable variable in tst_QGraphicsScene benchmark.
Documented behavior of blur effect radius and drop shadow offset.
Fixed autotest failure in tst_QPainter::drawEllipse on Maemo.
Use correct include path for qglobal.h
Fixed softkey localizaton to comile also on platforms without softkeys.
Use correct (forward slash) separators in qmake-generated bld.inf
Fix compilation on Mac 32-bit.
Doc fix, ensure that the \obsolete tag is placed correctly
Remove unusable test case from QGraphicsItem benchmark.
Remove unstable test case from QGraphicsItem::setTransform benchmark.
Stabilize QGraphicsItem benchmarks.
Added note to make QList destructor virtual in version 5
Fix handling of Evaluation licenses on the Windows configure.exe
Change all ptrdiff_t to qptrdiff.
...
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qeventdispatcher_mac.mm | 8 | ||||
-rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 17 | ||||
-rw-r--r-- | src/gui/kernel/qsoftkeymanager_p.h | 2 |
3 files changed, 17 insertions, 10 deletions
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm index 8a67dee..99b77d0 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/kernel/qeventdispatcher_mac.mm @@ -497,6 +497,14 @@ static bool IsMouseOrKeyEvent( NSEvent* event ) case NSOtherMouseDown: case NSOtherMouseUp: case NSOtherMouseDragged: +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + case NSEventTypeGesture: // touch events + case NSEventTypeMagnify: + case NSEventTypeSwipe: + case NSEventTypeRotate: + case NSEventTypeBeginGesture: + case NSEventTypeEndGesture: +#endif result = true; break; diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 6d108b0..7412b06 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -55,24 +55,24 @@ QT_BEGIN_NAMESPACE QSoftKeyManager *QSoftKeyManagerPrivate::self = 0; -const char *QSoftKeyManager::standardSoftKeyText(StandardSoftKey standardKey) +QString QSoftKeyManager::standardSoftKeyText(StandardSoftKey standardKey) { - const char *softKeyText = 0; + QString softKeyText; switch (standardKey) { case OkSoftKey: - softKeyText = QT_TRANSLATE_NOOP("QSoftKeyManager", "Ok"); + softKeyText = QSoftKeyManager::tr("Ok"); break; case SelectSoftKey: - softKeyText = QT_TRANSLATE_NOOP("QSoftKeyManager", "Select"); + softKeyText = QSoftKeyManager::tr("Select"); break; case DoneSoftKey: - softKeyText = QT_TRANSLATE_NOOP("QSoftKeyManager", "Done"); + softKeyText = QSoftKeyManager::tr("Done"); break; case MenuSoftKey: - softKeyText = QT_TRANSLATE_NOOP("QSoftKeyManager", "Options"); + softKeyText = QSoftKeyManager::tr("Options"); break; case CancelSoftKey: - softKeyText = QT_TRANSLATE_NOOP("QSoftKeyManager", "Cancel"); + softKeyText = QSoftKeyManager::tr("Cancel"); break; default: break; @@ -100,8 +100,7 @@ QSoftKeyManager::QSoftKeyManager() : QAction *QSoftKeyManager::createAction(StandardSoftKey standardKey, QWidget *actionWidget) { - const char* text = standardSoftKeyText(standardKey); - QAction *action = new QAction(QSoftKeyManager::tr(text), actionWidget); + QAction *action = new QAction(standardSoftKeyText(standardKey), actionWidget); QAction::SoftKeyRole softKeyRole = QAction::NoSoftKey; switch (standardKey) { case MenuSoftKey: // FALL-THROUGH diff --git a/src/gui/kernel/qsoftkeymanager_p.h b/src/gui/kernel/qsoftkeymanager_p.h index ce902fe..a6fe17e 100644 --- a/src/gui/kernel/qsoftkeymanager_p.h +++ b/src/gui/kernel/qsoftkeymanager_p.h @@ -87,6 +87,7 @@ public: static QAction *createAction(StandardSoftKey standardKey, QWidget *actionWidget); static QAction *createKeyedAction(StandardSoftKey standardKey, Qt::Key key, QWidget *actionWidget); + static QString standardSoftKeyText(StandardSoftKey standardKey); protected: bool event(QEvent *e); @@ -94,7 +95,6 @@ protected: private: QSoftKeyManager(); static QSoftKeyManager *instance(); - static const char *standardSoftKeyText(StandardSoftKey standardKey); bool appendSoftkeys(const QWidget &source, int level); QWidget *softkeySource(QWidget *previousSource, bool& recursiveMerging); bool handleUpdateSoftKeys(); |