diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-03-21 09:57:56 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-03-21 09:57:56 +0100 |
| commit | 7931159c09402b988e34f3dfe2c05b1d8664b5ed (patch) | |
| tree | 780cc6e24810cf67cc590e67986ee04f74b0119e /share/qtcreator/welcomescreen | |
| parent | acd49da4925103dc83bd2d8053d915d81cf26492 (diff) | |
| parent | 0e9bd4677ca3d5a0fd7f449a118222ee2f41c955 (diff) | |
| download | qt-creator-7931159c09402b988e34f3dfe2c05b1d8664b5ed.tar.gz | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
src/libs/qmljsdebugclient/qmlprofilereventlist.cpp
src/libs/zeroconf/servicebrowser.cpp
src/plugins/qmlprofiler/qml/MainView.qml
src/plugins/qmlprofiler/qmlprofilerengine.cpp
src/plugins/qmlprofiler/qmlprofilertool.cpp
src/plugins/qmlprofiler/qmlprofilertraceview.h
src/plugins/qmlprofiler/tracewindow.cpp
Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
Diffstat (limited to 'share/qtcreator/welcomescreen')
| -rw-r--r-- | share/qtcreator/welcomescreen/welcomescreen.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml index bfbb08df95..7eee5e82ba 100644 --- a/share/qtcreator/welcomescreen/welcomescreen.qml +++ b/share/qtcreator/welcomescreen/welcomescreen.qml @@ -85,7 +85,7 @@ Rectangle { Rectangle { visible: root.width > 1042 width: 2 - color: "#919191" + color: "#cdcdcd" anchors.left: parent.left anchors.top: parent.top anchors.bottom: parent.bottom @@ -94,7 +94,7 @@ Rectangle { Rectangle { visible: root.width > 1042 width: 2 - color: "#919191" + color: "#cdcdcd" anchors.right: parent.right anchors.top: parent.top anchors.bottom: parent.bottom |