Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit a33363a

Browse files
committed
fix import/export macros for static builds
1 parent aeddbfa commit a33363a

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

src/3rdparty/cryptopp/cryptopp.pro

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ win32:!win32-g++ {
440440
} else:unix|win32-g++ {
441441
clang: QMAKE_CXXFLAGS += -Wno-keyword-macro -Wno-unused-const-variable -Wno-unused-private-field
442442
else:gcc: QMAKE_CXXFLAGS += -Wno-class-memaccess -Wno-unknown-pragmas
443-
443+
444444
contains(QT_CPU_FEATURES.$$QT_ARCH, ssse3): QMAKE_CXXFLAGS += -mpclmul
445445
QMAKE_CFLAGS_SSSE3 += -mpclmul
446446

@@ -468,7 +468,3 @@ HEADER_INSTALL_DIR = "$$MODULE_BASE_OUTDIR/include/cryptopp"
468468
MODULE_INCLUDEPATH += "$$MODULE_BASE_OUTDIR/include"
469469

470470
load(qt_helper_lib)
471-
472-
# DEBUG
473-
message(QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH))
474-
message($$CONFIG)

src/datasync/qtdatasync_global.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
#include <QtCore/qglobal.h>
55
#include <QtCore/qstring.h>
66

7-
#if defined(QT_BUILD_DATASYNC_LIB)
8-
# define Q_DATASYNC_EXPORT Q_DECL_EXPORT
7+
#ifndef QT_STATIC
8+
# if defined(QT_BUILD_DATASYNC_LIB)
9+
# define Q_DATASYNC_EXPORT Q_DECL_EXPORT
10+
# else
11+
# define Q_DATASYNC_EXPORT Q_DECL_IMPORT
12+
# endif
913
#else
10-
# define Q_DATASYNC_EXPORT Q_DECL_IMPORT
14+
# define Q_DATASYNC_EXPORT
1115
#endif
1216

1317
#ifdef DOXYGEN_RUN

src/datasyncandroid/qtdatasyncandroid_global.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
#include <QtCore/qglobal.h>
55

6-
#if defined(QT_BUILD_DATASYNCANDROID_LIB)
7-
# define Q_DATASYNCANDROID_EXPORT Q_DECL_EXPORT
6+
#ifndef QT_STATIC
7+
# if defined(QT_BUILD_DATASYNCANDROID_LIB)
8+
# define Q_DATASYNCANDROID_EXPORT Q_DECL_EXPORT
9+
# else
10+
# define Q_DATASYNCANDROID_EXPORT Q_DECL_IMPORT
11+
# endif
812
#else
9-
# define Q_DATASYNCANDROID_EXPORT Q_DECL_IMPORT
13+
# define Q_DATASYNCANDROID_EXPORT
1014
#endif
1115

1216
#endif // QTDATASYNCANDROID_GLOBAL_H

src/datasyncios/qtdatasyncios_global.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
#include <QtCore/qglobal.h>
55

6-
#if defined(QT_BUILD_DATASYNCIOS_LIB)
7-
# define Q_DATASYNCIOS_EXPORT Q_DECL_EXPORT
6+
#ifndef QT_STATIC
7+
# if defined(QT_BUILD_DATASYNCIOS_LIB)
8+
# define Q_DATASYNCIOS_EXPORT Q_DECL_EXPORT
9+
# else
10+
# define Q_DATASYNCIOS_EXPORT Q_DECL_IMPORT
11+
# endif
812
#else
9-
# define Q_DATASYNCIOS_EXPORT Q_DECL_IMPORT
13+
# define Q_DATASYNCIOS_EXPORT
1014
#endif
1115

1216
#endif // QTDATASYNCIOS_GLOBAL_H

0 commit comments

Comments
 (0)