AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve duplicate symbols

Browse Source 
Turn some of the static variables into private static data members to
avoid symbol duplication during the unity build.

Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I9e3ee18f6e85a0f806de77f753d89a45ceaff7ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Amir Masoud Abdol 2023-04-19 14:11:08 +02:00
parent c2fd824160
commit 22b0ed0757
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
View File

@ -21,8 +21,8 @@
QT_BEGIN_NAMESPACE
static const char *ppsPath = "/pps/system/buttons/status";
static const int ppsBufferSize = 256;
const char *QQnxButtonEventNotifier::ppsPath = "/pps/system/buttons/status";
const size_t QQnxButtonEventNotifier::ppsBufferSize = 256;
QQnxButtonEventNotifier::QQnxButtonEventNotifier(QObject *parent)
: QObject(parent),

3
src/plugins/platforms/qnx/qqnxbuttoneventnotifier.h
View File

@ -45,6 +45,9 @@ private:
QSocketNotifier *m_readNotifier;
ButtonState m_state[ButtonCount];
QList<QByteArray> m_buttonKeys;
static const char *ppsPath;
static const size_t ppsBufferSize;
};
QT_END_NAMESPACE

6
src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.cpp
View File

@ -23,11 +23,11 @@
#define qNavigatorEventNotifierDebug QT_NO_QDEBUG_MACRO
#endif
static const char *navigatorControlPath = "/pps/services/navigator/control";
static const int ppsBufferSize = 4096;
QT_BEGIN_NAMESPACE
const char *QQnxNavigatorEventNotifier::navigatorControlPath = "/pps/services/navigator/control";
const size_t QQnxNavigatorEventNotifier::ppsBufferSize = 4096;
QQnxNavigatorEventNotifier::QQnxNavigatorEventNotifier(QQnxNavigatorEventHandler *eventHandler, QObject *parent)
: QObject(parent),
m_fd(-1),

3
src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.h
View File

@ -32,6 +32,9 @@ private:
int m_fd;
QSocketNotifier *m_readNotifier;
QQnxNavigatorEventHandler *m_eventHandler;
static const char *navigatorControlPath;
static const size_t ppsBufferSize;
};
QT_END_NAMESPACE

6
src/plugins/platforms/qnx/qqnxnavigatorpps.cpp
View File

@ -14,11 +14,11 @@
#define qNavigatorDebug QT_NO_QDEBUG_MACRO
#endif
static const char *navigatorControlPath = "/pps/services/navigator/control";
static const int ppsBufferSize = 4096;
QT_BEGIN_NAMESPACE
const char *QQnxNavigatorPps::navigatorControlPath = "/pps/services/navigator/control";
const size_t QQnxNavigatorPps::ppsBufferSize = 4096;
QQnxNavigatorPps::QQnxNavigatorPps(QObject *parent)
: QQnxAbstractNavigator(parent)
, m_fd(-1)

3
src/plugins/platforms/qnx/qqnxnavigatorpps.h
View File

@ -26,8 +26,9 @@ private:
bool sendPpsMessage(const QByteArray &message, const QByteArray &data);
void parsePPS(const QByteArray &ppsData, QHash<QByteArray, QByteArray> &messageFields);
private:
int m_fd;
static const char *navigatorControlPath;
static const size_t ppsBufferSize;
};
QT_END_NAMESPACE