diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 08:48:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 08:48:03 (GMT) |
| commit | 6b90ce1abd8a16cecd11e56453019bb86f94b5fe (patch) | |
| tree | 27ee8600e30dbde9e9f1c17dca113c7da93c721d /src/gui/dialogs | |
| parent | 6dcdab8d9ee66f420a525400d873cfccf78c7003 (diff) | |
| parent | d3cba714adb35098d515f7c4f8e90a4e38527d76 (diff) | |
| download | Qt-6b90ce1abd8a16cecd11e56453019bb86f94b5fe.zip Qt-6b90ce1abd8a16cecd11e56453019bb86f94b5fe.tar.gz Qt-6b90ce1abd8a16cecd11e56453019bb86f94b5fe.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: (201 commits)
Fixed a bug where a proxy widget received FocusIn over and over.
Fixed broken test.
Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles.
Fix dependency so it works also on massive parrallel systems
Set PM_MenuScrollerHeight to zero
Change QS60Style to use combobox popup menu
This should likely get webkit linking again on windows/sbsv2
Handle Symbian's file name encoding, correctly.
Fix linking issues of QtOpenVG.dll
Fixed Symbian applications with DESTDIR set.
Removed a warning about generated rss files.
Revert "Temporarily disable problematic dll."
Fixed "Cannot install protected application" message on Symbian.
Worked around a crash in the elf2e32 postlinker tool.
Worked around case differences in Symbian^3 and Gnupoc.
Enabled compilation of plugins again.
Make sure target path exists in qmake_extra_pre_targetdep.flm
Added close button to Anomaly demo browser
Fixed a building bug where the DLL entry point was undefined.
Moved UID2 processing from cpp code to profiles.
...
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qerrormessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qerrormessage.cpp b/src/gui/dialogs/qerrormessage.cpp index 0bca811..7be7481 100644 --- a/src/gui/dialogs/qerrormessage.cpp +++ b/src/gui/dialogs/qerrormessage.cpp @@ -70,10 +70,10 @@ extern bool qt_wince_is_high_dpi(); //defined in qguifunctions_wince.cpp #if defined(QT_SOFTKEYS_ENABLED) #include <qaction.h> +#endif #ifdef Q_WS_S60 #include "private/qt_s60_p.h" #endif -#endif QT_BEGIN_NAMESPACE |