diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 09:25:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 09:25:53 (GMT) |
| commit | e89a552f32592abf6478af3fcd54e05be339acd1 (patch) | |
| tree | 11459b2ab8c37cede618c6aa2b57c76196fa69ea | |
| parent | 6bde72bda0946003f1adcc276b1490018f9f7d72 (diff) | |
| parent | e4344f9e2150e807bd8fb2c4405172869719b0db (diff) | |
| download | Qt-e89a552f32592abf6478af3fcd54e05be339acd1.zip Qt-e89a552f32592abf6478af3fcd54e05be339acd1.tar.gz Qt-e89a552f32592abf6478af3fcd54e05be339acd1.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
now really fix the message editor for dark backgrounds
| -rw-r--r-- | tools/linguist/linguist/images/transbox.png | bin | 782 -> 0 bytes | |||
| -rw-r--r-- | tools/linguist/linguist/linguist.qrc | 3 | ||||
| -rw-r--r-- | tools/linguist/linguist/messageeditor.cpp | 8 |
3 files changed, 2 insertions, 9 deletions
diff --git a/tools/linguist/linguist/images/transbox.png b/tools/linguist/linguist/images/transbox.png Binary files differdeleted file mode 100644 index 2d7219b..0000000 --- a/tools/linguist/linguist/images/transbox.png +++ /dev/null diff --git a/tools/linguist/linguist/linguist.qrc b/tools/linguist/linguist/linguist.qrc index a43f0ce..b70b9cd 100644 --- a/tools/linguist/linguist/linguist.qrc +++ b/tools/linguist/linguist/linguist.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/" > + <qresource prefix="/"> <file>images/appicon.png</file> <file>images/mac/accelerator.png</file> <file>images/mac/book.png</file> @@ -28,7 +28,6 @@ <file>images/s_check_on.png</file> <file>images/s_check_warning.png</file> <file>images/splash.png</file> - <file>images/transbox.png</file> <file>images/up.png</file> <file>images/down.png</file> <file>images/editdelete.png</file> diff --git a/tools/linguist/linguist/messageeditor.cpp b/tools/linguist/linguist/messageeditor.cpp index b6c1688..3848723 100644 --- a/tools/linguist/linguist/messageeditor.cpp +++ b/tools/linguist/linguist/messageeditor.cpp @@ -98,14 +98,8 @@ MessageEditor::MessageEditor(MultiDataModel *dataModel, QMainWindow *parent) { setObjectName(QLatin1String("scroll area")); - // Use white explicitly as the background color for the editor page. QPalette p; - p.setColor(QPalette::Active, QPalette::Base, Qt::white); - p.setColor(QPalette::Inactive, QPalette::Base, Qt::white); - p.setColor(QPalette::Disabled, QPalette::Base, Qt::white); - p.setColor(QPalette::Active, QPalette::Window, Qt::white); - p.setColor(QPalette::Inactive, QPalette::Window, Qt::white); - p.setColor(QPalette::Disabled, QPalette::Window, Qt::white); + p.setBrush(QPalette::Window, p.brush(QPalette::Active, QPalette::Base)); setPalette(p); setupEditorPage(); |
