diff options
| author | con <qtc-committer@nokia.com> | 2010-05-11 13:39:21 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-05-11 13:39:21 +0200 |
| commit | 3922be1b2ec73efb8f31f03f62019c397f43b39c (patch) | |
| tree | f4ed799007bf84bb750da6c5db24283c6d2df381 /src/plugins/welcome | |
| parent | 17fd33bdabe4b7c72b1f268767968dd945089335 (diff) | |
| parent | 626221b685d2a1dc3dc990725e76badfea87fce8 (diff) | |
Merge remote branch 'origin/2.0'
Conflicts:
src/plugins/texteditor/texteditoractionhandler.cpp
Diffstat (limited to 'src/plugins/welcome')
| -rw-r--r-- | src/plugins/welcome/welcomemode.ui | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/welcome/welcomemode.ui b/src/plugins/welcome/welcomemode.ui index 57d2e98639..f00d137f2a 100644 --- a/src/plugins/welcome/welcomemode.ui +++ b/src/plugins/welcome/welcomemode.ui @@ -22,7 +22,7 @@ QToolButton, QPushButton, QComboBox { font-size: 12px; } -*{ +QToolButton, QPushButton, QComboBox, QLabel { color: black; } |