summaryrefslogtreecommitdiffstats
path: root/tools/qvfb
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-04-17 10:53:44 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-04-17 10:53:44 (GMT)
commit160252d5d1facf2a53af1314836f22fb00784625 (patch)
treee1a6a0be850671e32af0306ffd8b0c4a780da720 /tools/qvfb
parentfd73185195633fd97228a0c832c247b761967598 (diff)
parentcfa04d53ff58d45d7811637c8be76099740d25c5 (diff)
downloadQt-160252d5d1facf2a53af1314836f22fb00784625.zip
Qt-160252d5d1facf2a53af1314836f22fb00784625.tar.gz
Qt-160252d5d1facf2a53af1314836f22fb00784625.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
Diffstat (limited to 'tools/qvfb')
-rw-r--r--tools/qvfb/qvfb.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index b6a715c..62149a1 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -217,16 +217,10 @@ QVFb::QVFb( int display_id, int w, int h, int d, int r, const QString &skin, Dis
setWindowIcon( pix );
rateDlg = 0;
refreshRate = 30;
-#if QT_VERSION >= 0x030000
- // When compiling with Qt 3 we need to create the menu first to
- // avoid scroll bars in the main window
+ // Create the menu first to avoid scroll bars in the main window
createMenu( menuBar() );
init( display_id, w, h, d, r, skin );
enableCursor( true );
-#else
- init( display_id, w, h, d, r, skin );
- createMenu( menuBar() );
-#endif
}
QVFb::~QVFb()
@@ -354,9 +348,7 @@ void QVFb::init( int display_id, int pw, int ph, int d, int r, const QString& sk
scroller->setWidget(view);
view->setContentsMargins( 0, 0, 0, 0 );
setCentralWidget(scroller);
-#if QT_VERSION >= 0x030000
ph += 2; // avoid scrollbar
-#endif
scroller->show();
// delete defaultbuttons.conf if it was left behind...
unlink(QFileInfo(QString("/tmp/qtembedded-%1/defaultbuttons.conf").arg(view->displayId())).absoluteFilePath().toLatin1().constData());