diff --git a/share/qtcreator/templates/html5app/app.pro b/share/qtcreator/templates/html5app/app.pro index 1d712060877..66cddd26180 100644 --- a/share/qtcreator/templates/html5app/app.pro +++ b/share/qtcreator/templates/html5app/app.pro @@ -1,3 +1,5 @@ +greaterThan(QT_MAJOR_VERSION, 4):QT += widgets webkitwidgets + # Add more folders to ship with the application, here # DEPLOYMENTFOLDERS # folder_01.source = html diff --git a/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp b/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp index f594266c507..81e0598f39d 100644 --- a/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp +++ b/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp @@ -154,7 +154,7 @@ void Html5ApplicationViewer::setOrientation(ScreenOrientation orientation) case ScreenOrientationAuto: attribute = static_cast(130); break; -#else // QT_VERSION < 0x040702 +#elif QT_VERSION < 0x050000 case ScreenOrientationLockPortrait: attribute = Qt::WA_LockPortraitOrientation; break; @@ -165,7 +165,10 @@ void Html5ApplicationViewer::setOrientation(ScreenOrientation orientation) case ScreenOrientationAuto: attribute = Qt::WA_AutoOrientation; break; -#endif // QT_VERSION < 0x040702 +#else + default: + attribute = Qt::WidgetAttribute(); +#endif }; setAttribute(attribute, true); } diff --git a/src/plugins/qt4projectmanager/wizards/html5app.cpp b/src/plugins/qt4projectmanager/wizards/html5app.cpp index fcf3e1422fb..21964a5091c 100644 --- a/src/plugins/qt4projectmanager/wizards/html5app.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5app.cpp @@ -312,7 +312,7 @@ QList Html5App::deploymentFolders() const return result; } -const int Html5App::StubVersion = 11; +const int Html5App::StubVersion = 12; } // namespace Internal } // namespace Qt4ProjectManager diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp index 2ca60506836..9a7ba32c158 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp @@ -60,7 +60,7 @@ private: Html5AppWizardDialog::Html5AppWizardDialog(QWidget *parent, const Core::WizardDialogParameters ¶meters) : AbstractMobileAppWizardDialog(parent, QtSupport::QtVersionNumber(), - QtSupport::QtVersionNumber(4, INT_MAX, INT_MAX), parameters), + QtSupport::QtVersionNumber(), parameters), m_htmlOptionsPage(0) { setWindowTitle(tr("New HTML5 Application"));