diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2012-11-01 21:23:04 +0400 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2012-11-05 13:57:20 +0100 |
commit | db46db74eb0b1afb6a2ff34712b419e20a17f49a (patch) | |
tree | 5756528ef5d7ad6538d997e5d1900d50d288fe6e /src/ttylocker_unix_p.h | |
parent | eca1a6d30a98861cb811cb2faf8d01334e60dd7c (diff) | |
download | qtserialport-db46db74eb0b1afb6a2ff34712b419e20a17f49a.tar.gz |
Updating a project tree for compilation fixing
For optimization and build correction for Qt4/Qt5 there was a need for
unification and modification of a tree of projects.
The previous structure of the project didn't meet the changed requirements
for Qt5 that led to errors of build and complication of possibility of
correction of errors of build.
It is necessary to note the main changes:
* Removed not used /modules direcrory with all content, because it is
autogenerated.
* Moved all contents from /src directory to /src/serialport directory. It
was necessary for simplification of the qmake commands at building
for Qt5 (in particular, there is no need to fill out a module name since
it is the name of directory /serialport).
* Changed the exported macro defines Q_ADDON_SERIALPORT_EXPORT to
Q_SERIALPORT_EXPORT and QT_ADDON_SERIALPORT_LIB to QT_SERIALPORT_LIB. It
was necessary for fixing compilation error for unknown reason on Windows
and Qt5 when used MSVC compiler.
Checked on Windows and Gnu/Linux, also this patch fixes bug:
Task-number: QTPLAYGROUND-5
Change-Id: Idc9ba98115d5961a22ae307c0e4034a56f3223b5
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/ttylocker_unix_p.h')
-rw-r--r-- | src/ttylocker_unix_p.h | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/src/ttylocker_unix_p.h b/src/ttylocker_unix_p.h deleted file mode 100644 index ed93fb1..0000000 --- a/src/ttylocker_unix_p.h +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Denis Shienkov <scapig@yandex.ru> -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtSerialPort module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef TTYLOCKER_UNIX_P_H -#define TTYLOCKER_UNIX_P_H - -#include "serialport-global.h" - -QT_BEGIN_NAMESPACE_SERIALPORT - -class TtyLocker -{ -public: - static bool lock(const char *portName); - static bool unlock(const char *portName); - static bool isLocked(const char *portName, bool *currentPid); -}; - -QT_END_NAMESPACE_SERIALPORT - -#endif // TTYLOCKER_UNIX_P_H |