diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-09-29 13:37:46 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-09-29 13:38:11 +0200 |
| commit | 8ab25620d3df25c43011ae982f4614639578afb3 (patch) | |
| tree | e94d53c6b7d231ca18f0787a0c09bec07d163a67 /src/widgets/styles/qgtkstyle.cpp | |
| parent | dfe853bff90444edf92a993e391df853780c9e8d (diff) | |
| parent | 5222abfdf5f034bad12bbe12312a4149550495b7 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/network/socket/qnativesocketengine_unix.cpp
src/widgets/kernel/qwidget_qpa.cpp
Change-Id: I6f1aa320d5ca66cd92d601a95885aeaab0abb191
Diffstat (limited to 'src/widgets/styles/qgtkstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qgtkstyle.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index fe35c7c695..3916106af1 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -289,6 +289,7 @@ static QColor mergedColors(const QColor &colorA, const QColor &colorB, int facto static GdkColor fromQColor(const QColor &color) { GdkColor retval; + retval.pixel = 0; retval.red = color.red() * 255; retval.green = color.green() * 255; retval.blue = color.blue() * 255; |