diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-03 02:52:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-03 02:52:17 (GMT) |
| commit | daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be (patch) | |
| tree | 7d10df975019f40c7c279d917ca45caa4fd14f92 /src/gui/widgets/qmenubar_p.h | |
| parent | 8c01157a9056f91d40d3579bfc0eb9b81a5f99d8 (diff) | |
| parent | cefb4a2e9056f390871cd01f733c2519fd15d308 (diff) | |
| download | Qt-daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be.zip Qt-daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be.tar.gz Qt-daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Hide some more files from git-status.
Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.
Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.
Fixed deployment locations for various profiles.
Added a top-level runonphone target for Qt and QtWebKit.
QS60Style: Simplify QMenu drawing
QS60Style: Remove gap from QProgressDialog
ColorDialog is incorrectly positioned
Support for "deploy" make target in Symbian
qtguiu.def merge conflict fix
Fix for include "private/qt_s60_p.h" in non-symbian builds
Making orbit input methods work with Qt apps with -no-s60
Using the remaining valid data to construct the QTime object when msec parsing failed.
QProgressDialog text is too close to dialog border
fix for broken input method loading
Avkon Removal DEF file updates
Stub version of QS60Style
Avkon removal configured with -no-s60
QFileDialog broken in landscape in N8
Diffstat (limited to 'src/gui/widgets/qmenubar_p.h')
| -rw-r--r-- | src/gui/widgets/qmenubar_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h index 82070fe..fc6701c 100644 --- a/src/gui/widgets/qmenubar_p.h +++ b/src/gui/widgets/qmenubar_p.h @@ -269,10 +269,10 @@ public: } *symbian_menubar; static int symbianCommands(int command); +#endif #ifdef QT_SOFTKEYS_ENABLED QAction *menuBarAction; #endif -#endif }; #endif |