Merge branch 'stable' into dev

Change-Id: I0ff4fb4cb9acd73db397bc44c2970a7286a2d0c2

1 files changed, 0 insertions, 28 deletions

diff --git a/basicsuite/enterprise-gallery/ControlLabel.qml b/basicsuite/enterprise-gallery/ControlLabel.qml
deleted file mode 100644
index 0335342..0000000
--- a/basicsuite/enterprise-gallery/ControlLabel.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Text {
-    font.pixelSize: Math.min(32, root.toPixels(0.045))
-    color: "#4e4e4e"
-    styleColor: "#ffffff"
-    style: Text.Raised
-}