diff options
| author | con <qtc-committer@nokia.com> | 2010-05-12 17:25:40 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-05-12 17:25:40 +0200 |
| commit | 1fd12ab63bbf1bb632de2898859affd7c720752a (patch) | |
| tree | 4ccc7894979cb6bc3bca4efd55f927b8e74c6e2f /src/plugins/welcome | |
| parent | 64d65fb69811da29fa29b9e08ddd3b8a58e4cee3 (diff) | |
| parent | acea722d7543560b3ee7dd79dd5ab6a545eb51de (diff) | |
Merge remote branch 'origin/2.0'
Conflicts:
src/plugins/cpptools/cppcodecompletion.cpp
Diffstat (limited to 'src/plugins/welcome')
| -rw-r--r-- | src/plugins/welcome/images/welcomebg.png | bin | 73047 -> 21649 bytes | |||
| -rw-r--r-- | src/plugins/welcome/welcomemode.ui | 7 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/welcome/images/welcomebg.png b/src/plugins/welcome/images/welcomebg.png Binary files differindex 43e26923f6..a82abe93f7 100644 --- a/src/plugins/welcome/images/welcomebg.png +++ b/src/plugins/welcome/images/welcomebg.png diff --git a/src/plugins/welcome/welcomemode.ui b/src/plugins/welcome/welcomemode.ui index f00d137f2a..e60f8143ad 100644 --- a/src/plugins/welcome/welcomemode.ui +++ b/src/plugins/welcome/welcomemode.ui @@ -76,12 +76,7 @@ QToolButton:pressed, QPushButton:pressed{ <item> <widget class="QWidget" name="gradientWidget" native="true"> <property name="styleSheet"> - <string notr="true">/* -#gradientWidget { - background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:1.0, y2:1, stop:0 rgba(240, 240, 240, 255), stop:1 rgba(200, 200, 200, 255)); -} -*/ -#gradientWidget { + <string notr="true">#gradientWidget { border-image: url(:/welcome/images/welcomebg.png) 0; } </string> |
