diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qt_gui_pch.h | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qtguiglobal.h | 15 |
3 files changed, 3 insertions, 14 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 5fe4d59d107..d2be239d84e 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -277,6 +277,7 @@ qt_internal_add_module(Gui "painting/qdrawhelper.cpp" # special case PRECOMPILED_HEADER "kernel/qt_gui_pch.h" + GENERATE_CPP_EXPORTS ) # Resources: diff --git a/src/gui/kernel/qt_gui_pch.h b/src/gui/kernel/qt_gui_pch.h index 5e07fa45e7d..e7cccba027e 100644 --- a/src/gui/kernel/qt_gui_pch.h +++ b/src/gui/kernel/qt_gui_pch.h @@ -48,6 +48,7 @@ #include "../../corelib/global/qt_pch.h" #if defined __cplusplus +#include <qtguiexports.h> #include <qtguiglobal.h> #include <qguiapplication.h> #include <qbitmap.h> diff --git a/src/gui/kernel/qtguiglobal.h b/src/gui/kernel/qtguiglobal.h index 8a7409e3d94..2303d75466f 100644 --- a/src/gui/kernel/qtguiglobal.h +++ b/src/gui/kernel/qtguiglobal.h @@ -42,19 +42,6 @@ #include <QtCore/qglobal.h> #include <QtGui/qtgui-config.h> - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_GUI_LIB) -# define Q_GUI_EXPORT Q_DECL_EXPORT -# else -# define Q_GUI_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_GUI_EXPORT -#endif - -QT_END_NAMESPACE +#include <QtGui/qtguiexports.h> #endif // QTGUIGLOBAL_H |
