diff options
author | aavit <qt-info@nokia.com> | 2011-06-22 11:01:36 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2011-06-22 11:01:36 (GMT) |
commit | 2066945370f9d34cf9cff52f87d2f0e78dcb5b09 (patch) | |
tree | 32923325a125335edd5fc05df9d2bf40fe16b52a /examples/draganddrop/fridgemagnets/dragwidget.cpp | |
parent | 2701802511d9c09a11212cc37838154245b0c0ca (diff) | |
parent | e4cce8849bf45be9a111072e3fca7bdf67364e8a (diff) | |
download | Qt-2066945370f9d34cf9cff52f87d2f0e78dcb5b09.zip Qt-2066945370f9d34cf9cff52f87d2f0e78dcb5b09.tar.gz Qt-2066945370f9d34cf9cff52f87d2f0e78dcb5b09.tar.bz2 |
Merge remote branch 'qt-mainline/4.8'
Diffstat (limited to 'examples/draganddrop/fridgemagnets/dragwidget.cpp')
-rw-r--r-- | examples/draganddrop/fridgemagnets/dragwidget.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/draganddrop/fridgemagnets/dragwidget.cpp b/examples/draganddrop/fridgemagnets/dragwidget.cpp index aeab3ad..19abfb6 100644 --- a/examples/draganddrop/fridgemagnets/dragwidget.cpp +++ b/examples/draganddrop/fridgemagnets/dragwidget.cpp @@ -65,7 +65,11 @@ DragWidget::DragWidget(QWidget *parent) wordLabel->show(); wordLabel->setAttribute(Qt::WA_DeleteOnClose); x += wordLabel->width() + 2; +#if defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) + if (x >= 345) { +#else if (x >= 245) { +#endif x = 5; y += wordLabel->height() + 2; } |