Bug 626595 - Make it possible to build maemo 6 platform version without meegotouch r=romaxa,ted.mielczarek a=approval2.0

This commit is contained in:
Jeremias Bosch
2011-02-03 08:31:36 +02:00
parent cbc01d424a
commit cdd8e4d0cc
16 changed files with 63 additions and 269 deletions

View File

@@ -75,8 +75,10 @@
#if (MOZ_PLATFORM_MAEMO == 6)
#include <QUrl>
#include <QString>
#if (MOZ_ENABLE_CONTENTACTION)
#include <contentaction/contentaction.h>
#endif
#endif
#include "nsDirectoryServiceDefs.h"
#include "nsCRT.h"
@@ -1899,7 +1901,7 @@ nsLocalFile::Launch()
return NS_ERROR_FAILURE;
#endif
#elif (MOZ_PLATFORM_MAEMO == 6)
#elif defined(MOZ_ENABLE_CONTENTACTION)
QUrl uri = QUrl::fromLocalFile(QString::fromUtf8(mPath.get()));
ContentAction::Action action =
ContentAction::Action::defaultActionForFile(uri);