diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 04:26:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 04:26:07 (GMT) |
| commit | ab5fbde3235a6d613a8dfb58deb79c67b70d9f55 (patch) | |
| tree | 25a1c8df5f5239aedea7ae42060f282b7e44198e /src/gui/dialogs | |
| parent | 53fd1e2fd9c75d7d55606d4ac5df75eda96b9cc9 (diff) | |
| parent | 864bd41f16c56a4c8565c4c6a7096048862167c1 (diff) | |
| download | Qt-ab5fbde3235a6d613a8dfb58deb79c67b70d9f55.zip Qt-ab5fbde3235a6d613a8dfb58deb79c67b70d9f55.tar.gz Qt-ab5fbde3235a6d613a8dfb58deb79c67b70d9f55.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: (190 commits)
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.
Fixed a building bug where the DLL entry point was undefined.
Moved UID2 processing from cpp code to profiles.
Added rpp and rsg files to ignore filter.
Moved two profiles to the correct directory.
Fix build break caused by undefined symbol SetDialogPreference
Temporarily disable problematic dll.
Use the same concept for per-lib tweaks as armcc
Consistently use the * in configure
Symbian doesn't have large file support currently, just turn it off
Remove largefile config test
Make sure that we have all compile flags available always
Enabled dependencies for .dso and .lib libraries only.
Switched to using DEF_FILE, which is the official variable.
...
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 |