diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 06:03:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 06:03:37 (GMT) |
| commit | 85611635a3589d56c2670445ea5272e864e57a98 (patch) | |
| tree | 9eaf0842a9cd6f719e2d64866b806a84f57f8e1e /src/gui/widgets/qmenubar.h | |
| parent | 6d6b7b318a842ef5037065554f30ebfb4ae34d74 (diff) | |
| parent | 2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315 (diff) | |
| download | Qt-85611635a3589d56c2670445ea5272e864e57a98.zip Qt-85611635a3589d56c2670445ea5272e864e57a98.tar.gz Qt-85611635a3589d56c2670445ea5272e864e57a98.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (74 commits)
Fixed tst_compilerwarnings test failure due to icecc node failures.
QNAM HTTP: Remove dead code
Doc: fix typo
QCompleter: fix misuse of QMap that can lead to crashes
qmake: added possibility to specify the type of an install target
re-add overriding of tool paths to configure
fix regexp
Support linked fonts (.ltt) from standard font locations.
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Fix QUrl::isValid if the host contains invalid caracter.
Fix anomaly demo control strip icon placement
QUrl: parsing of host name with an undercore.
Fixed race condition compiling xmlpatterns tests.
Remove qdbusserver from tests/auto/dbus.pro
QNAM HTTP: Preemptive anti crash if() statement
...
Diffstat (limited to 'src/gui/widgets/qmenubar.h')
| -rw-r--r-- | src/gui/widgets/qmenubar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar.h b/src/gui/widgets/qmenubar.h index 85c0988..c63a4f5 100644 --- a/src/gui/widgets/qmenubar.h +++ b/src/gui/widgets/qmenubar.h @@ -115,7 +115,7 @@ public: void setDefaultAction(QAction *); QAction *defaultAction() const; - static void wceCommands(uint command, HWND controlHandle); + static void wceCommands(uint command); static void wceRefresh(); #endif |