From aeceb5e383c2c2946dd09dc70136cb905481b924 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Sun, 4 Jan 2015 23:04:41 +0100
Subject: QColorDialog: merge two consecutive ifs with the same test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I931bf8f61f95c879522daabf4fc9d6f5801a307b
Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/widgets/dialogs/qcolordialog.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/widgets/dialogs/qcolordialog.cpp')

diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index 40ef6505cf..b69dbfd650 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -1655,9 +1655,7 @@ void QColorDialogPrivate::initWidgets()
     if (!smallDisplay) {
         leftLay = new QVBoxLayout;
         topLay->addLayout(leftLay);
-    }
 
-    if (!smallDisplay) {
         standard = new QColorWell(q, standardColorRows, colorColumns, QColorDialogOptions::standardColors());
         lblBasicColors = new QLabel(q);
 #ifndef QT_NO_SHORTCUT
-- 
cgit v1.2.3