diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-21 12:46:01 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-01-22 14:06:16 +0000 |
| commit | 9a77f5f429c88518793673e924bb81768796215c (patch) | |
| tree | b62fa85ecd129087ed910640a620e36abac28909 /plugins/qmlprofiler/qmlprofilerextension_global.h | |
| parent | ed15f7067df9f25475915b2f69d6ff4140b926c6 (diff) | |
| download | qt-creator-qp-master.tar.gz | |
Prepare for merging into qtcreatorqp-master
Remove the licensechecker dependency, move everything into
src/plugins/qmlprofilerextension, and adapt the build system.
Change-Id: I58bf34ecd838514d02b5c50189cd8a5eb99793b0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'plugins/qmlprofiler/qmlprofilerextension_global.h')
| -rw-r--r-- | plugins/qmlprofiler/qmlprofilerextension_global.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/plugins/qmlprofiler/qmlprofilerextension_global.h b/plugins/qmlprofiler/qmlprofilerextension_global.h deleted file mode 100644 index a8faba9971..0000000000 --- a/plugins/qmlprofiler/qmlprofilerextension_global.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#ifndef QMLPROFILEREXTENSION_GLOBAL_H -#define QMLPROFILEREXTENSION_GLOBAL_H - -#include <QtGlobal> - -#if defined(QMLPROFILEREXTENSION_LIBRARY) -# define QMLPROFILEREXTENSIONSHARED_EXPORT Q_DECL_EXPORT -#else -# define QMLPROFILEREXTENSIONSHARED_EXPORT Q_DECL_IMPORT -#endif - -#endif // QMLPROFILEREXTENSION_GLOBAL_H - |