projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
43b9a99
)
Examples: Fix compilation.
author
Friedemann Kleint
<Friedemann.Kleint@nokia.com>
Wed, 25 May 2011 07:15:14 +0000
(09:15 +0200)
committer
Friedemann Kleint
<Friedemann.Kleint@nokia.com>
Wed, 25 May 2011 07:15:14 +0000
(09:15 +0200)
examples/examples.pro
patch
|
blob
|
history
examples/opengl/cube/cube.pro
patch
|
blob
|
history
examples/opengl/cube/main.cpp
patch
|
blob
|
history
examples/widgets/orientation/main.cpp
patch
|
blob
|
history
examples/widgets/orientation/orientation.pro
patch
|
blob
|
history
diff --git
a/examples/examples.pro
b/examples/examples.pro
index
b10ff59
..
c5a5ada
100644
(file)
--- a/
examples/examples.pro
+++ b/
examples/examples.pro
@@
-46,10
+46,6
@@
symbian: SUBDIRS = \
gestures \
xml
-!contains(QT_CONFIG, no-gui):contains(QT_CONFIG, multimedia) {
- SUBDIRS += multimedia
-}
-
qpa:SUBDIRS += qpa
embedded:SUBDIRS += qws
contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib
diff --git
a/examples/opengl/cube/cube.pro
b/examples/opengl/cube/cube.pro
index
64f6973
..
fd6e288
100644
(file)
--- a/
examples/opengl/cube/cube.pro
+++ b/
examples/opengl/cube/cube.pro
@@
-4,7
+4,7
@@
#
#-------------------------------------------------
-QT += core gui
+QT += core gui
widgets
TARGET = cube
TEMPLATE = app
diff --git
a/examples/opengl/cube/main.cpp
b/examples/opengl/cube/main.cpp
index
faac8a0
..
e5b99e7
100644
(file)
--- a/
examples/opengl/cube/main.cpp
+++ b/
examples/opengl/cube/main.cpp
@@
-1,4
+1,4
@@
-#include <Q
tGui/Q
Application>
+#include <QApplication>
#include <QLabel>
#ifndef QT_NO_OPENGL
diff --git
a/examples/widgets/orientation/main.cpp
b/examples/widgets/orientation/main.cpp
index
34b05d6
..
afaf211
100644
(file)
--- a/
examples/widgets/orientation/main.cpp
+++ b/
examples/widgets/orientation/main.cpp
@@
-1,4
+1,4
@@
-#include <Qt
Gui
/QApplication>
+#include <Qt
Widgets
/QApplication>
#include "mainwindow.h"
//! [0]
diff --git
a/examples/widgets/orientation/orientation.pro
b/examples/widgets/orientation/orientation.pro
index
c146322
..
cf443b5
100644
(file)
--- a/
examples/widgets/orientation/orientation.pro
+++ b/
examples/widgets/orientation/orientation.pro
@@
-4,7
+4,7
@@
#
#-------------------------------------------------
-QT += core gui
+QT += core gui
widgets
TARGET = orientation
TEMPLATE = app