diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-07-02 15:30:41 +0300 |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-07-02 15:30:41 +0300 |
| commit | e5bd34ac642bf7665f618e5e2ce5f62cfb29fb73 (patch) | |
| tree | 5b560586c51701d475412d000de83a48ab0cedc7 /src/gui/dialogs/qdialog.cpp | |
| parent | 6fd1da7a672532c53eb55b3e2467332d28df5943 (diff) | |
| download | qt4-tools-e5bd34ac642bf7665f618e5e2ce5f62cfb29fb73.tar.gz | |
ColorDialog is incorrectly positioned
Due to somewhat special nature of colorDialog, it makes no sense to
make it fullscreen, as it is not totally stretchable in height. Making
it fullscreen only makes it appear higher on the screen and there is
an ugly gap between the dialog and softkeys.
Therefore, as a fix, colorDialog is shown in its "natural" window
state.
Task-number: QTBUG-11668
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src/gui/dialogs/qdialog.cpp')
| -rw-r--r-- | src/gui/dialogs/qdialog.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index ce84aa62fd..9e0437c5bf 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -67,7 +67,6 @@ extern bool qt_wince_is_smartphone(); //is defined in qguifunctions_wce.cpp #elif defined(Q_OS_SYMBIAN) # include "qfiledialog.h" # include "qfontdialog.h" -# include "qcolordialog.h" # include "qwizard.h" # include "private/qt_s60_p.h" #endif @@ -532,7 +531,7 @@ int QDialog::exec() bool showSystemDialogFullScreen = false; #ifdef Q_OS_SYMBIAN if (qobject_cast<QFileDialog *>(this) || qobject_cast<QFontDialog *>(this) || - qobject_cast<QColorDialog *>(this) || qobject_cast<QWizard *>(this)) { + qobject_cast<QWizard *>(this)) { showSystemDialogFullScreen = true; } #endif // Q_OS_SYMBIAN |