summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/effects/lighting/lighting.cpp2
-rw-r--r--examples/graphicsview/anchorlayout/main.cpp4
-rw-r--r--examples/graphicsview/weatheranchorlayout/main.cpp34
-rw-r--r--examples/opengl/pbuffers/glwidget.cpp8
4 files changed, 24 insertions, 24 deletions
diff --git a/examples/effects/lighting/lighting.cpp b/examples/effects/lighting/lighting.cpp
index 7026b66..51fa9f8 100644
--- a/examples/effects/lighting/lighting.cpp
+++ b/examples/effects/lighting/lighting.cpp
@@ -94,7 +94,7 @@ void Lighting::setupScene()
else
item = new QGraphicsRectItem(0, 0, 50, 50);
- item->setPen(QPen(Qt::black));
+ item->setPen(QPen(Qt::black, 1));
item->setBrush(QBrush(Qt::white));
QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect;
effect->setBlurRadius(8);
diff --git a/examples/graphicsview/anchorlayout/main.cpp b/examples/graphicsview/anchorlayout/main.cpp
index 3e19f18..f898d1d 100644
--- a/examples/graphicsview/anchorlayout/main.cpp
+++ b/examples/graphicsview/anchorlayout/main.cpp
@@ -76,8 +76,8 @@ int main(int argc, char **argv)
QGraphicsProxyWidget *c = createItem(minSize, prefSize, maxSize, "C");
QGraphicsProxyWidget *d = createItem(minSize, prefSize, maxSize, "D");
QGraphicsProxyWidget *e = createItem(minSize, prefSize, maxSize, "E");
- QGraphicsProxyWidget *f = createItem(QSizeF(30, 50), QSizeF(150, 50), maxSize, "F");
- QGraphicsProxyWidget *g = createItem(QSizeF(30, 50), QSizeF(30, 100), maxSize, "G");
+ QGraphicsProxyWidget *f = createItem(QSizeF(30, 50), QSizeF(150, 50), maxSize, "F (overflow)");
+ QGraphicsProxyWidget *g = createItem(QSizeF(30, 50), QSizeF(30, 100), maxSize, "G (overflow)");
QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
l->setSpacing(0);
diff --git a/examples/graphicsview/weatheranchorlayout/main.cpp b/examples/graphicsview/weatheranchorlayout/main.cpp
index 9002828..d835ae3 100644
--- a/examples/graphicsview/weatheranchorlayout/main.cpp
+++ b/examples/graphicsview/weatheranchorlayout/main.cpp
@@ -185,20 +185,12 @@ int main(int argc, char **argv)
QGraphicsScene scene;
scene.setSceneRect(0, 0, 800, 480);
-#ifdef DEBUG_MODE
- QGraphicsProxyWidget *title = createItem("Title");
- QGraphicsProxyWidget *place = createItem("Place");
- QGraphicsProxyWidget *sun = createItem("Sun");
- QGraphicsProxyWidget *details = createItem("Details");
- QGraphicsProxyWidget *tabbar = createItem("Tabbar");
-#else
- // pixmaps widgets
- PixmapWidget *title = new PixmapWidget(QPixmap(":/images/title.jpg"));
- PlaceWidget *place = new PlaceWidget(QPixmap(":/images/place.jpg"));
- PixmapWidget *details = new PixmapWidget(QPixmap(":/images/5days.jpg"));
- PixmapWidget *sun = new PixmapWidget(QPixmap(":/images/weather-few-clouds.png"));
- PixmapWidget *tabbar = new PixmapWidget(QPixmap(":/images/tabbar.jpg"));
-#endif
+ // pixmaps widgets
+ PixmapWidget *title = new PixmapWidget(QPixmap(":/images/title.jpg"));
+ PlaceWidget *place = new PlaceWidget(QPixmap(":/images/place.jpg"));
+ PixmapWidget *details = new PixmapWidget(QPixmap(":/images/5days.jpg"));
+ PixmapWidget *sunnyWeather = new PixmapWidget(QPixmap(":/images/weather-few-clouds.png"));
+ PixmapWidget *tabbar = new PixmapWidget(QPixmap(":/images/tabbar.jpg"));
// setup sizes
@@ -215,9 +207,9 @@ int main(int argc, char **argv)
tabbar->setPreferredSize(QSizeF(70, 24));
tabbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
- sun->setPreferredSize(QSizeF(128, 97));
- sun->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
- sun->setZValue(9999);
+ sunnyWeather->setPreferredSize(QSizeF(128, 97));
+ sunnyWeather->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+ sunnyWeather->setZValue(9999);
// start anchor layout
QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
@@ -238,8 +230,8 @@ int main(int argc, char **argv)
anchor = l->addAnchor(place, Qt::AnchorBottom, l, Qt::AnchorBottom);
anchor->setSpacing(12);
- anchor = l->addAnchor(sun, Qt::AnchorTop, title, Qt::AnchorTop);
- anchor = l->addAnchor(sun, Qt::AnchorBottom, l, Qt::AnchorVerticalCenter);
+ anchor = l->addAnchor(sunnyWeather, Qt::AnchorTop, title, Qt::AnchorTop);
+ anchor = l->addAnchor(sunnyWeather, Qt::AnchorBottom, l, Qt::AnchorVerticalCenter);
anchor = l->addAnchor(tabbar, Qt::AnchorTop, title, Qt::AnchorBottom);
anchor->setSpacing(5);
@@ -257,8 +249,8 @@ int main(int argc, char **argv)
anchor = l->addAnchor(place, Qt::AnchorRight, details, Qt::AnchorLeft);
anchor->setSpacing(35);
- anchor = l->addAnchor(sun, Qt::AnchorLeft, place, Qt::AnchorHorizontalCenter);
- anchor = l->addAnchor(sun, Qt::AnchorRight, l, Qt::AnchorHorizontalCenter);
+ anchor = l->addAnchor(sunnyWeather, Qt::AnchorLeft, place, Qt::AnchorHorizontalCenter);
+ anchor = l->addAnchor(sunnyWeather, Qt::AnchorRight, l, Qt::AnchorHorizontalCenter);
anchor = l->addAnchor(tabbar, Qt::AnchorHorizontalCenter, details, Qt::AnchorHorizontalCenter);
anchor = l->addAnchor(details, Qt::AnchorRight, l, Qt::AnchorRight);
diff --git a/examples/opengl/pbuffers/glwidget.cpp b/examples/opengl/pbuffers/glwidget.cpp
index 56ba65b..d843a73 100644
--- a/examples/opengl/pbuffers/glwidget.cpp
+++ b/examples/opengl/pbuffers/glwidget.cpp
@@ -175,7 +175,11 @@ void GLWidget::perspectiveProjection()
{
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
+#ifdef QT_OPENGL_ES
+ glFrustumf(-aspect, +aspect, -1.0, +1.0, 4.0, 15.0);
+#else
glFrustum(-aspect, +aspect, -1.0, +1.0, 4.0, 15.0);
+#endif
glMatrixMode(GL_MODELVIEW);
}
@@ -183,7 +187,11 @@ void GLWidget::orthographicProjection()
{
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
+#ifdef QT_OPENGL_ES
+ glOrthof(-1.0, +1.0, -1.0, +1.0, -90.0, +90.0);
+#else
glOrtho(-1.0, +1.0, -1.0, +1.0, -90.0, +90.0);
+#endif
glMatrixMode(GL_MODELVIEW);
}