feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtQuickWizards: Fix compilation

Browse Source 
compilation fails when "Use Qt module in #include directive" is
enabled.

Change-Id: If8d59e631fc58d4400bf0597e415e66c9fb5279d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tasuku Suzuki
2015-08-22 19:16:53 +09:00
committed by Alessandro Portale
parent 86bca29f36
commit f598101284
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication/main.cpp
View File

@@ -1,5 +1,5 @@
%{Cpp:LicenseTemplate}\ %{Cpp:LicenseTemplate}\
%{JS: QtSupport.qtIncludes([], ["QGui/QGuiApplication", "QQml/QQmlApplicationEngine"])} %{JS: QtSupport.qtIncludes([], ["QtGui/QGuiApplication", "QtQml/QQmlApplicationEngine"])}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);

2
share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/main.cpp
View File

@@ -1,5 +1,5 @@
%{Cpp:LicenseTemplate}\ %{Cpp:LicenseTemplate}\
%{JS: QtSupport.qtIncludes([], ["QGui/QGuiApplication", "QQml/QQmlApplicationEngine"])} %{JS: QtSupport.qtIncludes([], ["QtGui/QGuiApplication", "QtQml/QQmlApplicationEngine"])}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);

2
share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/main.cpp
View File

@@ -1,5 +1,5 @@
%{Cpp:LicenseTemplate}\ %{Cpp:LicenseTemplate}\
%{JS: QtSupport.qtIncludes([], [%{UseQApplication} ? "QWidgets/QApplication" : "QtGui/QGuiApplication", "QQml/QQmlApplicationEngine"])} %{JS: QtSupport.qtIncludes([], [%{UseQApplication} ? "QtWidgets/QApplication" : "QtGui/QGuiApplication", "QtQml/QQmlApplicationEngine"])}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@if %{UseQApplication} @if %{UseQApplication}