diff options
| -rw-r--r-- | examples/activeqt/hierarchy/hierarchy.pro | 1 | ||||
| -rw-r--r-- | examples/activeqt/multiple/multiple.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/wrapper/wrapper.pro | 2 | ||||
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 4 |
4 files changed, 2 insertions, 7 deletions
diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/examples/activeqt/hierarchy/hierarchy.pro index 84ee712..9d4c665 100644 --- a/examples/activeqt/hierarchy/hierarchy.pro +++ b/examples/activeqt/hierarchy/hierarchy.pro @@ -2,7 +2,6 @@ TEMPLATE = lib TARGET = hierarchyax CONFIG += qt warn_off qaxserver dll -contains(CONFIG, static):DEFINES += QT_NODLL QT += widgets SOURCES = objects.cpp main.cpp diff --git a/examples/activeqt/multiple/multiple.pro b/examples/activeqt/multiple/multiple.pro index b5713b0..295376d 100644 --- a/examples/activeqt/multiple/multiple.pro +++ b/examples/activeqt/multiple/multiple.pro @@ -4,8 +4,6 @@ TARGET = multipleax CONFIG += qt warn_off qaxserver dll QT += widgets -contains(CONFIG, static):DEFINES += QT_NODLL - SOURCES = main.cpp HEADERS = ax1.h ax2.h RC_FILE = multipleax.rc diff --git a/examples/activeqt/wrapper/wrapper.pro b/examples/activeqt/wrapper/wrapper.pro index c1a736c..1d2c3ae 100644 --- a/examples/activeqt/wrapper/wrapper.pro +++ b/examples/activeqt/wrapper/wrapper.pro @@ -4,8 +4,6 @@ TARGET = wrapperax CONFIG += qt warn_off qaxserver dll QT += widgets -contains(CONFIG, static):DEFINES += QT_NODLL - SOURCES = main.cpp RC_FILE = wrapperax.rc DEF_FILE = wrapperax.def diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index ec406e5..e183c7e 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -1763,7 +1763,7 @@ void QAxServerBase::resize(const QSize &size) // make sure we get a resize event even if not embedded as a control if (!m_hWnd && !qt.widget->isVisible() && newSize != oldSize) { QResizeEvent resizeEvent(newSize, oldSize); -#ifndef QT_DLL // import from static library +#ifndef QT_SHARED // import from static library extern bool qt_sendSpontaneousEvent(QObject*,QEvent*); #endif qt_sendSpontaneousEvent(qt.widget, &resizeEvent); @@ -4035,7 +4035,7 @@ HRESULT WINAPI QAxServerBase::SetColorScheme(LOGPALETTE*) } -#ifdef QT_DLL // avoid conflict with symbol in static lib +#ifdef QT_SHARED // avoid conflict with symbol in static lib bool qt_sendSpontaneousEvent(QObject *o, QEvent *e) { return QCoreApplication::sendSpontaneousEvent(o, e); |