diff options
Diffstat (limited to 'examples/quickcontrols/extras/flat/main.cpp')
| -rw-r--r-- | examples/quickcontrols/extras/flat/main.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/examples/quickcontrols/extras/flat/main.cpp b/examples/quickcontrols/extras/flat/main.cpp index 57f48cda2..61b1e9b3e 100644 --- a/examples/quickcontrols/extras/flat/main.cpp +++ b/examples/quickcontrols/extras/flat/main.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are @@ -46,12 +56,12 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - if (qgetenv("QT_QUICK_CONTROLS_STYLE").isEmpty()) { + if (qgetenv("QT_QUICK_CONTROLS_1_STYLE").isEmpty()) { #ifdef QT_STATIC // Need a full path to find the style when built statically - qputenv("QT_QUICK_CONTROLS_STYLE", ":/ExtrasImports/QtQuick/Controls/Styles/Flat"); + qputenv("QT_QUICK_CONTROLS_1_STYLE", ":/ExtrasImports/QtQuick/Controls/Styles/Flat"); #else - qputenv("QT_QUICK_CONTROLS_STYLE", "Flat"); + qputenv("QT_QUICK_CONTROLS_1_STYLE", "Flat"); #endif } QQmlApplicationEngine engine; |