diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-31 08:13:19 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-31 08:13:19 +0200 |
| commit | a62cfc890be99aeb84d3cfaca6ca1e09a1e81642 (patch) | |
| tree | 67191f62f04d118001a7011d4cf910bb27f099d0 | |
| parent | 04bd0d5d937634510b31ab0d15e05ce1e879a0aa (diff) | |
| parent | ae0b101884b05355e3a7bc06dbca722ad3d08d0f (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: I37193904abebbb8775b7b8f9d4fc48622d7e6b24
| -rw-r--r-- | src/remoteobjects/qconnectionfactories.h | 4 | ||||
| -rw-r--r-- | tools/repc/repc.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/remoteobjects/qconnectionfactories.h b/src/remoteobjects/qconnectionfactories.h index 4d1e0ce..e9f8b45 100644 --- a/src/remoteobjects/qconnectionfactories.h +++ b/src/remoteobjects/qconnectionfactories.h @@ -155,7 +155,7 @@ class QtROServerFactory public: QtROServerFactory(); - static QtROServerFactory *instance(); + Q_REMOTEOBJECTS_EXPORT static QtROServerFactory *instance(); QConnectionAbstractServer *create(const QUrl &url, QObject *parent = nullptr) { @@ -181,7 +181,7 @@ class QtROClientFactory public: QtROClientFactory(); - static QtROClientFactory *instance(); + Q_REMOTEOBJECTS_EXPORT static QtROClientFactory *instance(); /// creates an object from a string ClientIoDevice *create(const QUrl &url, QObject *parent = nullptr) diff --git a/tools/repc/repc.pro b/tools/repc/repc.pro index 03db59f..204bd16 100644 --- a/tools/repc/repc.pro +++ b/tools/repc/repc.pro @@ -5,7 +5,7 @@ QT = core-private force_bootstrap:isEqual(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 5): error("compiling repc for bootstrap requires Qt 5.5 or higher, due to missing libraries.") DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_URL_CAST_FROM_STRING -DEFINES += RO_INSTALL_HEADERS=\\\"$$clean_path($$[QT_INSTALL_HEADERS])/QtRemoteObjects\\\" +DEFINES += RO_INSTALL_HEADERS=$$shell_quote(\"$$clean_path($$[QT_INSTALL_HEADERS]/QtRemoteObjects)\") win32-msvc*:!wince: QMAKE_CXXFLAGS += /wd4129 CONFIG += qlalr |