diff options
Diffstat (limited to 'demos/mobile')
-rw-r--r-- | demos/mobile/guitartuner/guitartuner.pro | 6 | ||||
-rw-r--r-- | demos/mobile/guitartuner/src/guitartuner.cpp | 38 | ||||
-rw-r--r-- | demos/mobile/guitartuner/src/guitartuner.h | 2 | ||||
-rw-r--r-- | demos/mobile/guitartuner/src/main.cpp | 2 | ||||
-rw-r--r-- | demos/mobile/qtbubblelevel/main.cpp | 2 | ||||
-rw-r--r-- | demos/mobile/qtbubblelevel/qtbubblelevel.pro | 2 | ||||
-rw-r--r-- | demos/mobile/quickhit/main.cpp | 2 | ||||
-rw-r--r-- | demos/mobile/quickhit/quickhit.pro | 2 |
8 files changed, 11 insertions, 45 deletions
diff --git a/demos/mobile/guitartuner/guitartuner.pro b/demos/mobile/guitartuner/guitartuner.pro index 62835300..b86f4778 100644 --- a/demos/mobile/guitartuner/guitartuner.pro +++ b/demos/mobile/guitartuner/guitartuner.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui +QT += core gui widgets TARGET = guitartuner TEMPLATE = app @@ -65,8 +65,8 @@ symbian { TARGET.CAPABILITY = UserEnvironment } -# Add declarative module -QT += declarative +# Add quick1 module +QT += quick1 OTHER_FILES += \ src/application.qml \ diff --git a/demos/mobile/guitartuner/src/guitartuner.cpp b/demos/mobile/guitartuner/src/guitartuner.cpp index 43222f2d..35c553b3 100644 --- a/demos/mobile/guitartuner/src/guitartuner.cpp +++ b/demos/mobile/guitartuner/src/guitartuner.cpp @@ -320,40 +320,6 @@ void GuitarTuner::setMaxVolumeLevel(qreal percent) */ void GuitarTuner::setOrientation(Orientation orientation) { -#ifdef Q_OS_SYMBIAN - if (orientation != Auto) { -#if defined(ORIENTATIONLOCK) - const CAknAppUiBase::TAppUiOrientation uiOrientation = - (orientation == LockPortrait) - ? CAknAppUi::EAppUiOrientationPortrait - : CAknAppUi::EAppUiOrientationLandscape; - CAknAppUi* appUi = dynamic_cast<CAknAppUi*> - (CEikonEnv::Static()->AppUi()); - TRAPD(error, - if (appUi) - appUi->SetOrientationL(uiOrientation); - ); -#else // ORIENTATIONLOCK - qWarning(QString("'ORIENTATIONLOCK' needs to be defined on") - +QString(" Symbian when locking the orientation.")); -#endif // ORIENTATIONLOCK - } -#elif defined(Q_WS_MAEMO_5) - Qt::WidgetAttribute attribute; - switch (orientation) { - case LockPortrait: - attribute = Qt::WA_Maemo5PortraitOrientation; - break; - case LockLandscape: - attribute = Qt::WA_Maemo5LandscapeOrientation; - break; - case Auto: - default: - attribute = Qt::WA_Maemo5AutoOrientation; - break; - } - setAttribute(attribute, true); -#else // Q_OS_SYMBIAN - Q_UNUSED(orientation); -#endif // Q_OS_SYMBIAN + // TODO: Needs a Qt5 implmentation + Q_UNUSED(orientation) } diff --git a/demos/mobile/guitartuner/src/guitartuner.h b/demos/mobile/guitartuner/src/guitartuner.h index fbb16f7c..fdac53fa 100644 --- a/demos/mobile/guitartuner/src/guitartuner.h +++ b/demos/mobile/guitartuner/src/guitartuner.h @@ -42,7 +42,7 @@ #define MAINWINDOW_H #include <QMainWindow> -#include <QtDeclarative> +#include <QtQuick1> #include <QAudioDeviceInfo> #include <QAudioOutput> #include <QAudioInput> diff --git a/demos/mobile/guitartuner/src/main.cpp b/demos/mobile/guitartuner/src/main.cpp index 7ddd1f78..39307934 100644 --- a/demos/mobile/guitartuner/src/main.cpp +++ b/demos/mobile/guitartuner/src/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "guitartuner.h" int main(int argc, char *argv[]) diff --git a/demos/mobile/qtbubblelevel/main.cpp b/demos/mobile/qtbubblelevel/main.cpp index df1393dd..a8de03c4 100644 --- a/demos/mobile/qtbubblelevel/main.cpp +++ b/demos/mobile/qtbubblelevel/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtDeclarative> +#include <QtQuick1> #include <QtGui> #include <QAccelerometer> diff --git a/demos/mobile/qtbubblelevel/qtbubblelevel.pro b/demos/mobile/qtbubblelevel/qtbubblelevel.pro index 3314815b..93c676c6 100644 --- a/demos/mobile/qtbubblelevel/qtbubblelevel.pro +++ b/demos/mobile/qtbubblelevel/qtbubblelevel.pro @@ -1,4 +1,4 @@ -QT += core gui declarative +QT += core gui quick1 CONFIG += mobility MOBILITY += sensors diff --git a/demos/mobile/quickhit/main.cpp b/demos/mobile/quickhit/main.cpp index e6e021da..fbfd4ceb 100644 --- a/demos/mobile/quickhit/main.cpp +++ b/demos/mobile/quickhit/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QDesktopWidget> #include "mainwindow.h" diff --git a/demos/mobile/quickhit/quickhit.pro b/demos/mobile/quickhit/quickhit.pro index 44bf09b6..70a8145b 100644 --- a/demos/mobile/quickhit/quickhit.pro +++ b/demos/mobile/quickhit/quickhit.pro @@ -1,4 +1,4 @@ -QT += core gui declarative opengl +QT += core gui quick1 opengl VERSION = 1.1.1 |