diff options
author | Miroslav Safr <miroslav.safr@tieto.com> | 2010-09-10 14:41:49 +0300 |
---|---|---|
committer | Miroslav Safr <miroslav.safr@tieto.com> | 2010-09-10 15:48:06 +0300 |
commit | 6cd88dd97a9a61dbfc5f1f947f8cb3cac8393ccf (patch) | |
tree | 35d35bea83466f41858335c8743cd8b3393e3cd1 /demos/widgetsgallery | |
parent | 1814a0005dbeb6ca54ff69c9020c713e2f1e628d (diff) |
Chanegs: HAVE_N900 macros renamed to M_OS_MAEMO5
RevBy: MaxW, Holger
Details: The features are platform specific and currently we have also Meego images for N900 so the old naming was misleading
Diffstat (limited to 'demos/widgetsgallery')
-rw-r--r-- | demos/widgetsgallery/main.cpp | 4 | ||||
-rw-r--r-- | demos/widgetsgallery/swaphook.h | 4 | ||||
-rw-r--r-- | demos/widgetsgallery/widgetsgallery.pro | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/demos/widgetsgallery/main.cpp b/demos/widgetsgallery/main.cpp index b4572112..4fb203a3 100644 --- a/demos/widgetsgallery/main.cpp +++ b/demos/widgetsgallery/main.cpp @@ -57,9 +57,9 @@ public: int main(int argc, char **argv) { -#ifdef HAVE_N900 +#ifdef M_OS_MAEMO5 QApplication::setGraphicsSystem(QLatin1String("native")); -#endif +#endif //M_OS_MAEMO5 //MApplication application(argc, argv, "widgetsgallery", new MyApplicationService() ); MApplication application(argc, argv, "widgetsgallery"); diff --git a/demos/widgetsgallery/swaphook.h b/demos/widgetsgallery/swaphook.h index adf5059e..e02ad1c7 100644 --- a/demos/widgetsgallery/swaphook.h +++ b/demos/widgetsgallery/swaphook.h @@ -7,10 +7,10 @@ typedef unsigned long long timestamp; #ifdef __arm__ #define EGL #include <EGL/egl.h> -# ifdef HAVE_N900 +# ifdef M_OS_MAEMO5 # define EGLAPI # define EGLAPIENTRY -# endif //HAVE_N900 +# endif //M_OS_MAEMO5 #endif //__arm__ #include <QObject> diff --git a/demos/widgetsgallery/widgetsgallery.pro b/demos/widgetsgallery/widgetsgallery.pro index ee462249..aff11942 100644 --- a/demos/widgetsgallery/widgetsgallery.pro +++ b/demos/widgetsgallery/widgetsgallery.pro @@ -136,7 +136,7 @@ HEADERS += templatepage.h \ # theme include(theme/theme.pri) -contains( DEFINES, HAVE_N900 ) { +contains( DEFINES, M_OS_MAEMO5 ) { CONFIG += release link_pkgconfig desktop_icon.path = $$M_INSTALL_DATA/icons/hicolor/48x48/hildon |