diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-22 11:26:08 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-22 11:26:08 (GMT) |
| commit | 97930918c8f5d20c6a27c22a1f0670ac7576c17a (patch) | |
| tree | 688f93eacf376df07679f06203834e44143103fa /src/gui/util | |
| parent | 80fc5bf17e5f049a395d6a5612843c69c5b0fde1 (diff) | |
| parent | 66818ea9bc50af50bb26515cf667fe1c0c62a12d (diff) | |
| download | Qt-97930918c8f5d20c6a27c22a1f0670ac7576c17a.zip Qt-97930918c8f5d20c6a27c22a1f0670ac7576c17a.tar.gz Qt-97930918c8f5d20c6a27c22a1f0670ac7576c17a.tar.bz2 | |
Merge remote branch 'origin/master' into qtruntime
Conflicts:
src/declarative/qml/qml.pri
src/declarative/qml/qmlengine.cpp
src/declarative/util/qmlview.h
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qdesktopservices_s60.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp index 0f5792f..65b998f 100644 --- a/src/gui/util/qdesktopservices_s60.cpp +++ b/src/gui/util/qdesktopservices_s60.cpp @@ -48,7 +48,6 @@ #include <qurl.h> #include <private/qcore_symbian_p.h> -#include <miutset.h> // KUidMsgTypeSMTP #include <txtrich.h> // CRichText #include <f32file.h> // TDriveUnit etc #include <eikenv.h> // CEikonEnv @@ -57,6 +56,9 @@ #include <rsendas.h> // RSendAs #include <rsendasmessage.h> // RSendAsMessage +// copied from miutset.h, so we don't get a dependency into the app layer +const TUid KUidMsgTypeSMTP = {0x10001028}; // 268439592 + #ifdef Q_WS_S60 # include <pathinfo.h> // PathInfo # ifdef USE_DOCUMENTHANDLER |