diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-14 15:35:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-17 03:24:15 +0200 |
| commit | eedcc340f1c1e8bb09759946a4b2c241e219cc58 (patch) | |
| tree | 82bccd0f8ec9b61027254795616efdaa31620e50 /examples/camera | |
| parent | 4840be02398041315da8be67041a8cd9152ee8a1 (diff) | |
Compile with refactor
Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856
Reviewed-on: http://codereview.qt-project.org/4940
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'examples/camera')
| -rw-r--r-- | examples/camera/camera.cpp | 2 | ||||
| -rw-r--r-- | examples/camera/camera.pro | 1 | ||||
| -rw-r--r-- | examples/camera/imagesettings.cpp | 2 | ||||
| -rw-r--r-- | examples/camera/imagesettings.h | 2 | ||||
| -rw-r--r-- | examples/camera/main.cpp | 2 | ||||
| -rw-r--r-- | examples/camera/videosettings.cpp | 2 | ||||
| -rw-r--r-- | examples/camera/videosettings.h | 2 |
7 files changed, 7 insertions, 6 deletions
diff --git a/examples/camera/camera.cpp b/examples/camera/camera.cpp index f9f37ce3d..b8bb675be 100644 --- a/examples/camera/camera.cpp +++ b/examples/camera/camera.cpp @@ -51,7 +51,7 @@ #include <qmessagebox.h> #include <qpalette.h> -#include <QtGui> +#include <QtWidgets> #if (defined(Q_WS_MAEMO_6)) && QT_VERSION >= 0x040700 #define HAVE_CAMERA_BUTTONS diff --git a/examples/camera/camera.pro b/examples/camera/camera.pro index e49e03186..a519354ed 100644 --- a/examples/camera/camera.pro +++ b/examples/camera/camera.pro @@ -25,3 +25,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera INSTALLS += target sources +QT+=widgets diff --git a/examples/camera/imagesettings.cpp b/examples/camera/imagesettings.cpp index c1bb2bec6..c3b9b22c2 100644 --- a/examples/camera/imagesettings.cpp +++ b/examples/camera/imagesettings.cpp @@ -41,7 +41,7 @@ #include "imagesettings.h" #include "ui_imagesettings.h" -#include <QtGui/qcombobox.h> +#include <QtWidgets/qcombobox.h> #include <QtCore/qdebug.h> #include <qcameraimagecapture.h> #include <qmediaservice.h> diff --git a/examples/camera/imagesettings.h b/examples/camera/imagesettings.h index 6a245fc26..74bca37d1 100644 --- a/examples/camera/imagesettings.h +++ b/examples/camera/imagesettings.h @@ -41,7 +41,7 @@ #ifndef IMAGESETTINGS_H #define IMAGESETTINGS_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include <qmediaencodersettings.h> QT_BEGIN_NAMESPACE diff --git a/examples/camera/main.cpp b/examples/camera/main.cpp index 4fc98ec8d..af2fa4c86 100644 --- a/examples/camera/main.cpp +++ b/examples/camera/main.cpp @@ -40,7 +40,7 @@ #include "camera.h" -#include <QtGui> +#include <QtWidgets> int main(int argc, char *argv[]) { diff --git a/examples/camera/videosettings.cpp b/examples/camera/videosettings.cpp index f9ab33362..c1d816012 100644 --- a/examples/camera/videosettings.cpp +++ b/examples/camera/videosettings.cpp @@ -41,7 +41,7 @@ #include "videosettings.h" #include "ui_videosettings.h" -#include <QtGui/qcombobox.h> +#include <QtWidgets/qcombobox.h> #include <QtCore/qdebug.h> #include <qmediarecorder.h> #include <qmediaservice.h> diff --git a/examples/camera/videosettings.h b/examples/camera/videosettings.h index b84dc8ed2..6cce31d0b 100644 --- a/examples/camera/videosettings.h +++ b/examples/camera/videosettings.h @@ -41,7 +41,7 @@ #ifndef VIDEOSETTINGS_H #define VIDEOSETTINGS_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include <qmediaencodersettings.h> QT_BEGIN_NAMESPACE |