diff options
Diffstat (limited to 'examples/xmlpatterns/recipes/querymainwindow.h')
-rw-r--r-- | examples/xmlpatterns/recipes/querymainwindow.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/examples/xmlpatterns/recipes/querymainwindow.h b/examples/xmlpatterns/recipes/querymainwindow.h index 4f8119a..215dc64 100644 --- a/examples/xmlpatterns/recipes/querymainwindow.h +++ b/examples/xmlpatterns/recipes/querymainwindow.h @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 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 @@ -43,11 +53,7 @@ #include <QMainWindow> -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - #include "ui_querywidget_mobiles.h" -#else - #include "ui_querywidget.h" -#endif +#include "ui_querywidget.h" QT_BEGIN_NAMESPACE class QComboBox; @@ -66,7 +72,7 @@ public slots: void displayQuery(int index); private: - QComboBox* ui_defaultQueries; + QComboBox *ui_defaultQueries = nullptr; void evaluate(const QString &str); void loadInputFile(); |