diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 11:06:01 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 11:06:01 +0200 |
| commit | 6d4888bab754e3dd439599ed53c2a3ae900760e9 (patch) | |
| tree | c517954fa3c1d34779bbdfbd46d09d0e5f358d7f /demos | |
| parent | 1427884ac16febb8ee12d240236fb4f223902aea (diff) | |
| parent | 3fd4dd035e3accfb8e6ef74e6f7543fcef42bef1 (diff) | |
Merge branch 'refactor'
Conflicts:
demos/quick3d/robo_bounce/main.cpp
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qt3d/photobrowser3d/main.cpp | 2 | ||||
| -rw-r--r-- | demos/quick3d/flickr3d/main.cpp | 2 | ||||
| -rw-r--r-- | demos/quick3d/model_viewer/main.cpp | 2 | ||||
| -rw-r--r-- | demos/quick3d/robo_bounce/main.cpp | 2 | ||||
| -rw-r--r-- | demos/quick3d/tea_service/main.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/demos/qt3d/photobrowser3d/main.cpp b/demos/qt3d/photobrowser3d/main.cpp index c26a9c542..2236160b7 100644 --- a/demos/qt3d/photobrowser3d/main.cpp +++ b/demos/qt3d/photobrowser3d/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtCore/QThread> #include "qgltexture2d.h" #include "photobrowser3dview.h" diff --git a/demos/quick3d/flickr3d/main.cpp b/demos/quick3d/flickr3d/main.cpp index 7b01416b9..e1c67c23a 100644 --- a/demos/quick3d/flickr3d/main.cpp +++ b/demos/quick3d/flickr3d/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../qmlres.h" diff --git a/demos/quick3d/model_viewer/main.cpp b/demos/quick3d/model_viewer/main.cpp index 127be2721..89e1506f4 100644 --- a/demos/quick3d/model_viewer/main.cpp +++ b/demos/quick3d/model_viewer/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../qmlres.h" diff --git a/demos/quick3d/robo_bounce/main.cpp b/demos/quick3d/robo_bounce/main.cpp index 07f7f2199..043ccb6c1 100644 --- a/demos/quick3d/robo_bounce/main.cpp +++ b/demos/quick3d/robo_bounce/main.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> #include "qgltexture2d.h" +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" int main(int argc, char *argv[]) diff --git a/demos/quick3d/tea_service/main.cpp b/demos/quick3d/tea_service/main.cpp index ed22e4b93..b7f5a6728 100644 --- a/demos/quick3d/tea_service/main.cpp +++ b/demos/quick3d/tea_service/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../qmlres.h" |