diff --git a/src/corelib/thread/qfutureinterface_p.h b/src/corelib/thread/qfutureinterface_p.h
index 9bf87d4db38..ec3517bab36 100644
--- a/src/corelib/thread/qfutureinterface_p.h
+++ b/src/corelib/thread/qfutureinterface_p.h
@@ -29,7 +29,11 @@ QT_REQUIRE_CONFIG(future);
 
 QT_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QFutureCallOutEvent : public QEvent
+// Although QFutureCallOutEvent and QFutureCallOutInterface are private,
+// for historical reasons they were used externally (in QtJambi, see
+// https://github.com/OmixVisualization/qtjambi), so we export them to
+// not break the pre-existing code.
+class Q_CORE_EXPORT QFutureCallOutEvent : public QEvent
 {
     Q_DECL_EVENT_COMMON(QFutureCallOutEvent)
 public:
diff --git a/tests/auto/gui/kernel/qevent/tst_qevent.cpp b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
index 0ad8a60beaa..5420a5bd5f6 100644
--- a/tests/auto/gui/kernel/qevent/tst_qevent.cpp
+++ b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
@@ -8,12 +8,6 @@
 #include <QtGui/qevent.h>
 #include <QtCore/private/qfutureinterface_p.h>
 
-#ifdef QT_BUILD_INTERNAL
-# define ONLY_IF_INTERNAL_BUILD(...) __VA_ARGS__
-#else
-# define ONLY_IF_INTERNAL_BUILD(...)
-#endif
-
 #define FOR_EACH_CORE_EVENT(X) \
     /* qcoreevent.h */ \
     X(QEvent, (QEvent::None)) \
@@ -22,7 +16,7 @@
     X(QDynamicPropertyChangeEvent, ("size")) \
     X(QDeferredDeleteEvent, ()) \
     /* qfutureinterface_p.h */ \
-    ONLY_IF_INTERNAL_BUILD(X(QFutureCallOutEvent, ())) \
+    X(QFutureCallOutEvent, ()) \
     /* end */
 
 #define FOR_EACH_GUI_EVENT(X) \