diff options
author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-13 08:53:27 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-16 15:23:38 (GMT) |
commit | 48c7ac801fb0ffe8a7b050af7f60524ea6abba44 (patch) | |
tree | 24dd24763b8ee01948f38cdd09e5d2c9383a2ab6 /examples | |
parent | b34d09f4ce0e9afd9352954e888901a95c6dc57e (diff) | |
download | Qt-48c7ac801fb0ffe8a7b050af7f60524ea6abba44.zip Qt-48c7ac801fb0ffe8a7b050af7f60524ea6abba44.tar.gz Qt-48c7ac801fb0ffe8a7b050af7f60524ea6abba44.tar.bz2 |
Compile fix Solaris: "sun" is defined to 1 on Solaris :)
(cherry picked from commit f79ecb7db2f26078541de6c31661fba76e12c9c0)
Diffstat (limited to 'examples')
-rw-r--r-- | examples/graphicsview/weatheranchorlayout/main.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/graphicsview/weatheranchorlayout/main.cpp b/examples/graphicsview/weatheranchorlayout/main.cpp index 9002828..3ccde50 100644 --- a/examples/graphicsview/weatheranchorlayout/main.cpp +++ b/examples/graphicsview/weatheranchorlayout/main.cpp @@ -188,7 +188,7 @@ int main(int argc, char **argv) #ifdef DEBUG_MODE QGraphicsProxyWidget *title = createItem("Title"); QGraphicsProxyWidget *place = createItem("Place"); - QGraphicsProxyWidget *sun = createItem("Sun"); + QGraphicsProxyWidget *sunnyWeather = createItem("Sun"); QGraphicsProxyWidget *details = createItem("Details"); QGraphicsProxyWidget *tabbar = createItem("Tabbar"); #else @@ -196,7 +196,7 @@ int main(int argc, char **argv) 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 *sunnyWeather = new PixmapWidget(QPixmap(":/images/weather-few-clouds.png")); PixmapWidget *tabbar = new PixmapWidget(QPixmap(":/images/tabbar.jpg")); #endif @@ -215,9 +215,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 +238,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 +257,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); |