diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-29 03:54:47 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-29 03:54:47 (GMT) |
| commit | bfbded95056d43a65b2c9ef1fa90bfd40adc6472 (patch) | |
| tree | c20ababb5a2e124e9c7ac796ace1d52380470bd3 /tools/qvfb/qvfb.cpp | |
| parent | e8bc4cebe9963a8a4534a5febbd606a6e4d6a332 (diff) | |
| parent | f425c08d4f2e7f061a0ee8e4a1eee2b17fa64962 (diff) | |
| download | Qt-bfbded95056d43a65b2c9ef1fa90bfd40adc6472.zip Qt-bfbded95056d43a65b2c9ef1fa90bfd40adc6472.tar.gz Qt-bfbded95056d43a65b2c9ef1fa90bfd40adc6472.tar.bz2 | |
Merge branch '4.6' of ../qt into kinetic-declarativeui
Conflicts:
src/script/api/qscriptengine.cpp
src/script/api/qscriptprogram.cpp
src/script/api/qscriptprogram.h
src/script/api/qscriptprogram_p.h
tests/auto/qscriptengine/tst_qscriptengine.cpp
tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
tools/qdoc3/test/qt-inc.qdocconf
Diffstat (limited to 'tools/qvfb/qvfb.cpp')
| -rw-r--r-- | tools/qvfb/qvfb.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp index 59e8dae..09692b7 100644 --- a/tools/qvfb/qvfb.cpp +++ b/tools/qvfb/qvfb.cpp @@ -669,6 +669,8 @@ void QVFb::configure() w=320; h=240; } else if ( config->size_640_480->isChecked() ) { w=640; h=480; + } else if ( config->size_800_480->isChecked() ) { + w=800; h=480; } else if ( config->size_800_600->isChecked() ) { w=800; h=600; } else if ( config->size_1024_768->isChecked() ) { @@ -748,6 +750,7 @@ void QVFb::chooseSize(const QSize& sz) config->size_240_320->setChecked(sz == QSize(240,320)); config->size_320_240->setChecked(sz == QSize(320,240)); config->size_640_480->setChecked(sz == QSize(640,480)); + config->size_800_480->setChecked(sz == QSize(800,480)); config->size_800_600->setChecked(sz == QSize(800,600)); config->size_1024_768->setChecked(sz == QSize(1024,768)); } |