diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-02-13 12:30:08 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-03-10 14:16:22 +0000 |
| commit | e27267a9e344019dc2bc61951ad9f0285c62b3b3 (patch) | |
| tree | 6309376eb792e55da03f6eb77903215408353f91 /libqdb | |
| parent | f44fc5178bc417e93ec1b2e400dd6dea2d82982b (diff) | |
Make libqdb a static library
Previously it was a shared library, but the symbols were not exported
properly, which meant that trying to use them lead to linker failures
when using MSVC.
This was previously worked around by including the files a second time,
so remove those workarounds.
Change-Id: Ieafd066c5a3924573cd5e6e397a0e544a35564b3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'libqdb')
| -rw-r--r-- | libqdb/libqdb.pro | 4 | ||||
| -rw-r--r-- | libqdb/libqdb_global.h | 32 | ||||
| -rw-r--r-- | libqdb/protocol/qdbtransport.h | 1 |
3 files changed, 1 insertions, 36 deletions
diff --git a/libqdb/libqdb.pro b/libqdb/libqdb.pro index 650ec61..a14ffb2 100644 --- a/libqdb/libqdb.pro +++ b/libqdb/libqdb.pro @@ -2,8 +2,7 @@ QT -= gui TARGET = qdb TEMPLATE = lib - -DEFINES += LIBQDB_LIBRARY +CONFIG += staticlib SOURCES += \ abstractconnection.cpp \ @@ -16,7 +15,6 @@ SOURCES += \ HEADERS += \ abstractconnection.h \ interruptsignalhandler.h \ - libqdb_global.h \ protocol/protocol.h \ protocol/qdbmessage.h \ protocol/qdbtransport.h \ diff --git a/libqdb/libqdb_global.h b/libqdb/libqdb_global.h deleted file mode 100644 index 86e9393..0000000 --- a/libqdb/libqdb_global.h +++ /dev/null @@ -1,32 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Debug Bridge. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ -#ifndef LIBQDB_GLOBAL_H -#define LIBQDB_GLOBAL_H - -#include <QtCore/qglobal.h> - -#if defined(LIBQDB_LIBRARY) -# define LIBQDBSHARED_EXPORT Q_DECL_EXPORT -#else -# define LIBQDBSHARED_EXPORT Q_DECL_IMPORT -#endif - -#endif // LIBQDB_GLOBAL_H diff --git a/libqdb/protocol/qdbtransport.h b/libqdb/protocol/qdbtransport.h index d98e1ae..8b1de92 100644 --- a/libqdb/protocol/qdbtransport.h +++ b/libqdb/protocol/qdbtransport.h @@ -30,7 +30,6 @@ QT_END_NAMESPACE #include <memory> - class QdbTransport : public QObject { Q_OBJECT |