Improve stable.h.
This commit is contained in:
parent
3599577b83
commit
2ba1a5db5e
|
@ -57,7 +57,15 @@
|
||||||
# include <QtWidgets>
|
# include <QtWidgets>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
//Build doesn't work, if include this headers on Windows.
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
# ifdef QT_XMLPATTERNS_LIB
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
# include <QtXmlPatterns>
|
# include <QtXmlPatterns>
|
||||||
# endif
|
# endif
|
||||||
|
@ -65,6 +73,10 @@
|
||||||
# ifdef QT_NETWORK_LIB
|
# ifdef QT_NETWORK_LIB
|
||||||
# include <QtNetwork>
|
# include <QtNetwork>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif/*Q_OS_WIN*/
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif /*__cplusplus*/
|
#endif /*__cplusplus*/
|
||||||
|
|
|
@ -57,8 +57,6 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutLineWidth, (QLatin1String(
|
||||||
int cachedLineWidth = -1;
|
int cachedLineWidth = -1;
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
Q_DECLARE_METATYPE(QMarginsF)
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPSettings::VPSettings(Format format, Scope scope, const QString &organization, const QString &application,
|
VPSettings::VPSettings(Format format, Scope scope, const QString &organization, const QString &application,
|
||||||
QObject *parent)
|
QObject *parent)
|
||||||
|
|
|
@ -57,7 +57,15 @@
|
||||||
# include <QtWidgets>
|
# include <QtWidgets>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
//Build doesn't work, if include this headers on Windows.
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
# ifdef QT_XMLPATTERNS_LIB
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
# include <QtXmlPatterns>
|
# include <QtXmlPatterns>
|
||||||
# endif
|
# endif
|
||||||
|
@ -65,6 +73,10 @@
|
||||||
# ifdef QT_NETWORK_LIB
|
# ifdef QT_NETWORK_LIB
|
||||||
# include <QtNetwork>
|
# include <QtNetwork>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif/*Q_OS_WIN*/
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif /*__cplusplus*/
|
#endif /*__cplusplus*/
|
||||||
|
|
|
@ -39,9 +39,9 @@
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
|
|
||||||
/*In all cases we need include core header for getting defined values*/
|
/*In all cases we need include core header for getting defined values*/
|
||||||
//#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
//# include <QtCore>
|
# include <QtCore>
|
||||||
//#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_GUI_LIB
|
#ifdef QT_GUI_LIB
|
||||||
# include <QtGui>
|
# include <QtGui>
|
||||||
|
@ -73,6 +73,10 @@
|
||||||
# ifdef QT_NETWORK_LIB
|
# ifdef QT_NETWORK_LIB
|
||||||
# include <QtNetwork>
|
# include <QtNetwork>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif/*Q_OS_WIN*/
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif /*__cplusplus*/
|
#endif /*__cplusplus*/
|
||||||
|
|
|
@ -38,19 +38,32 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_GUI_LIB
|
||||||
|
# include <QtGui>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_XML_LIB
|
#ifdef QT_XML_LIB
|
||||||
# include <QtXml>
|
# include <QtXml>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//In Windows you can't use those headers in all modes.
|
//In Windows you can't use same header in all modes.
|
||||||
#if !defined(Q_OS_WIN)
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifdef QT_PRINTSUPPORT_LIB
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
# include <QtPrintSupport>
|
# include <QtPrintSupport>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
# ifdef QT_XMLPATTERNS_LIB
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
# include <QtXmlPatterns>
|
# include <QtXmlPatterns>
|
||||||
# endif
|
# endif
|
||||||
|
@ -58,6 +71,10 @@
|
||||||
# ifdef QT_NETWORK_LIB
|
# ifdef QT_NETWORK_LIB
|
||||||
# include <QtNetwork>
|
# include <QtNetwork>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif/*Q_OS_WIN*/
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
|
@ -38,19 +38,32 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_GUI_LIB
|
||||||
|
# include <QtGui>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_XML_LIB
|
#ifdef QT_XML_LIB
|
||||||
# include <QtXml>
|
# include <QtXml>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//In Windows you can't use those headers in all modes.
|
//In Windows you can't use same header in all modes.
|
||||||
#if !defined(Q_OS_WIN)
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifdef QT_PRINTSUPPORT_LIB
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
# include <QtPrintSupport>
|
# include <QtPrintSupport>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
# ifdef QT_XMLPATTERNS_LIB
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
# include <QtXmlPatterns>
|
# include <QtXmlPatterns>
|
||||||
# endif
|
# endif
|
||||||
|
@ -58,6 +71,10 @@
|
||||||
# ifdef QT_NETWORK_LIB
|
# ifdef QT_NETWORK_LIB
|
||||||
# include <QtNetwork>
|
# include <QtNetwork>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif/*Q_OS_WIN*/
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
|
@ -35,9 +35,44 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_GUI_LIB
|
||||||
|
# include <QtGui>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_XML_LIB
|
||||||
|
# include <QtXml>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -40,13 +40,45 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_GUI_LIB
|
#ifdef QT_GUI_LIB
|
||||||
# include <QtGui>
|
# include <QtGui>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_XML_LIB
|
||||||
|
# include <QtXml>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -38,19 +38,32 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_GUI_LIB
|
||||||
|
# include <QtGui>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_XML_LIB
|
#ifdef QT_XML_LIB
|
||||||
# include <QtXml>
|
# include <QtXml>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//In Windows you can't use those headers in all modes.
|
//In Windows you can't use same header in all modes.
|
||||||
#if !defined(Q_OS_WIN)
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifdef QT_PRINTSUPPORT_LIB
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
# include <QtPrintSupport>
|
# include <QtPrintSupport>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
# ifdef QT_XMLPATTERNS_LIB
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
# include <QtXmlPatterns>
|
# include <QtXmlPatterns>
|
||||||
# endif
|
# endif
|
||||||
|
@ -58,6 +71,10 @@
|
||||||
# ifdef QT_NETWORK_LIB
|
# ifdef QT_NETWORK_LIB
|
||||||
# include <QtNetwork>
|
# include <QtNetwork>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif/*Q_OS_WIN*/
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
|
@ -38,13 +38,45 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_GUI_LIB
|
#ifdef QT_GUI_LIB
|
||||||
# include <QtGui>
|
# include <QtGui>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_XML_LIB
|
||||||
|
# include <QtXml>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -38,9 +38,45 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_GUI_LIB
|
||||||
|
# include <QtGui>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_XML_LIB
|
||||||
|
# include <QtXml>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -38,17 +38,45 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_GUI_LIB
|
#ifdef QT_GUI_LIB
|
||||||
# include <QtGui>
|
# include <QtGui>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_GUI_LIB
|
#ifdef QT_XML_LIB
|
||||||
# include <QtWidgets>
|
# include <QtXml>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -68,8 +68,6 @@ const qreal VCommonSettings::defaultScrollingAcceleration = 1.3;
|
||||||
const qreal VCommonSettings::scrollingAccelerationMin = 1.0;
|
const qreal VCommonSettings::scrollingAccelerationMin = 1.0;
|
||||||
const qreal VCommonSettings::scrollingAccelerationMax = 10.0;
|
const qreal VCommonSettings::scrollingAccelerationMax = 10.0;
|
||||||
|
|
||||||
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
|
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsIndividualMeasurements, (QLatin1String("paths/individual_measurements"))) // NOLINT
|
Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsIndividualMeasurements, (QLatin1String("paths/individual_measurements"))) // NOLINT
|
||||||
|
|
|
@ -46,8 +46,6 @@
|
||||||
#include "../vlayout/vbank.h"
|
#include "../vlayout/vbank.h"
|
||||||
#include "qglobal.h"
|
#include "qglobal.h"
|
||||||
|
|
||||||
Q_DECLARE_METATYPE(QMarginsF)
|
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingConfigurationLabelLanguage, // NOLINT
|
Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingConfigurationLabelLanguage, // NOLINT
|
||||||
|
|
|
@ -38,13 +38,45 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_GUI_LIB
|
#ifdef QT_GUI_LIB
|
||||||
# include <QtGui>
|
# include <QtGui>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_XML_LIB
|
||||||
|
# include <QtXml>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -38,13 +38,45 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_GUI_LIB
|
#ifdef QT_GUI_LIB
|
||||||
# include <QtGui>
|
# include <QtGui>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_XML_LIB
|
||||||
|
# include <QtXml>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -34,6 +34,42 @@
|
||||||
# include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_GUI_LIB
|
||||||
|
# include <QtGui>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_XML_LIB
|
||||||
|
# include <QtXml>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif /*__cplusplus*/
|
#endif /*__cplusplus*/
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -38,13 +38,49 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_GUI_LIB
|
#ifdef QT_GUI_LIB
|
||||||
# include <QtGui>
|
# include <QtGui>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_XML_LIB
|
||||||
|
# include <QtXml>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_TESTLIB_LIB
|
||||||
|
# include <QtTest>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -39,9 +39,9 @@
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
|
|
||||||
/*In all cases we need include core header for getting defined values*/
|
/*In all cases we need include core header for getting defined values*/
|
||||||
//#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
//# include <QtCore>
|
# include <QtCore>
|
||||||
//#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_GUI_LIB
|
#ifdef QT_GUI_LIB
|
||||||
# include <QtGui>
|
# include <QtGui>
|
||||||
|
@ -73,6 +73,10 @@
|
||||||
# ifdef QT_NETWORK_LIB
|
# ifdef QT_NETWORK_LIB
|
||||||
# include <QtNetwork>
|
# include <QtNetwork>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif/*Q_OS_WIN*/
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif /*__cplusplus*/
|
#endif /*__cplusplus*/
|
||||||
|
|
|
@ -38,13 +38,45 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef QT_GUI_LIB
|
#ifdef QT_GUI_LIB
|
||||||
# include <QtGui>
|
# include <QtGui>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_XML_LIB
|
||||||
|
# include <QtXml>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif/*__cplusplus*/
|
#endif/*__cplusplus*/
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -51,6 +51,10 @@
|
||||||
# include <QtXml>
|
# include <QtXml>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_TESTLIB_LIB
|
||||||
|
# include <QtTest>
|
||||||
|
#endif
|
||||||
|
|
||||||
//In Windows you can't use same header in all modes.
|
//In Windows you can't use same header in all modes.
|
||||||
#if !defined(Q_OS_WIN)
|
#if !defined(Q_OS_WIN)
|
||||||
# ifdef QT_WIDGETS_LIB
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
@ -73,6 +77,10 @@
|
||||||
# ifdef QT_NETWORK_LIB
|
# ifdef QT_NETWORK_LIB
|
||||||
# include <QtNetwork>
|
# include <QtNetwork>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif/*Q_OS_WIN*/
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif /*__cplusplus*/
|
#endif /*__cplusplus*/
|
||||||
|
|
|
@ -38,9 +38,49 @@
|
||||||
/* Add C++ includes here */
|
/* Add C++ includes here */
|
||||||
|
|
||||||
#ifdef QT_CORE_LIB
|
#ifdef QT_CORE_LIB
|
||||||
#include <QtCore>
|
# include <QtCore>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_GUI_LIB
|
||||||
|
# include <QtGui>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_XML_LIB
|
||||||
|
# include <QtXml>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_TESTLIB_LIB
|
||||||
|
# include <QtTest>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//In Windows you can't use same header in all modes.
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
# include <QtWidgets>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_SVG_LIB
|
||||||
|
# include <QtSvg/QtSvg>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_PRINTSUPPORT_LIB
|
||||||
|
# include <QtPrintSupport>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
//Build doesn't work, if include this headers on Windows.
|
||||||
|
# ifdef QT_XMLPATTERNS_LIB
|
||||||
|
# include <QtXmlPatterns>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_NETWORK_LIB
|
||||||
|
# include <QtNetwork>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // STABLE_H
|
#endif // STABLE_H
|
||||||
|
|
|
@ -51,6 +51,10 @@
|
||||||
# include <QtXml>
|
# include <QtXml>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_TESTLIB_LIB
|
||||||
|
# include <QtTest>
|
||||||
|
#endif
|
||||||
|
|
||||||
//In Windows you can't use same header in all modes.
|
//In Windows you can't use same header in all modes.
|
||||||
#if !defined(Q_OS_WIN)
|
#if !defined(Q_OS_WIN)
|
||||||
# ifdef QT_WIDGETS_LIB
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
@ -73,6 +77,10 @@
|
||||||
# ifdef QT_NETWORK_LIB
|
# ifdef QT_NETWORK_LIB
|
||||||
# include <QtNetwork>
|
# include <QtNetwork>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif/*Q_OS_WIN*/
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif /*__cplusplus*/
|
#endif /*__cplusplus*/
|
||||||
|
|
|
@ -51,6 +51,10 @@
|
||||||
# include <QtXml>
|
# include <QtXml>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef QT_TESTLIB_LIB
|
||||||
|
# include <QtTest>
|
||||||
|
#endif
|
||||||
|
|
||||||
//In Windows you can't use same header in all modes.
|
//In Windows you can't use same header in all modes.
|
||||||
#if !defined(Q_OS_WIN)
|
#if !defined(Q_OS_WIN)
|
||||||
# ifdef QT_WIDGETS_LIB
|
# ifdef QT_WIDGETS_LIB
|
||||||
|
@ -73,6 +77,10 @@
|
||||||
# ifdef QT_NETWORK_LIB
|
# ifdef QT_NETWORK_LIB
|
||||||
# include <QtNetwork>
|
# include <QtNetwork>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
# ifdef QT_CONCURRENT_LIB
|
||||||
|
# include <QtConcurrent>
|
||||||
|
# endif
|
||||||
#endif/*Q_OS_WIN*/
|
#endif/*Q_OS_WIN*/
|
||||||
|
|
||||||
#endif /*__cplusplus*/
|
#endif /*__cplusplus*/
|
||||||
|
|
Loading…
Reference in New Issue
Block a user