From 619ab8080dfc4e0908552e71ee2ae19db6ab2c9c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 21 Apr 2016 16:19:52 +0200
Subject: [PATCH] fix build and installation of queuedcustomtype example
it was not built at all (and didn't build with qt in a namespace), and
consequently was not installed as well.
Change-Id: I24d8ac4dd5d70927c262ad6336e5ee32a0fd003a
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
---
.../corelib/threads/queuedcustomtype/queuedcustomtype.pro | 2 +-
examples/corelib/threads/queuedcustomtype/window.h | 2 ++
examples/corelib/threads/threads.pro | 4 +++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro b/examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro
index 77421eb6380..8b91fb9ac7d 100644
--- a/examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro
+++ b/examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro
@@ -8,7 +8,7 @@ SOURCES = main.cpp \
QT += widgets
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/corelib/threads/mandelbrot
+target.path = $$[QT_INSTALL_EXAMPLES]/corelib/threads/queuedcustomtype
INSTALLS += target
diff --git a/examples/corelib/threads/queuedcustomtype/window.h b/examples/corelib/threads/queuedcustomtype/window.h
index b1e578faa00..52c67428dd0 100644
--- a/examples/corelib/threads/queuedcustomtype/window.h
+++ b/examples/corelib/threads/queuedcustomtype/window.h
@@ -44,8 +44,10 @@
#include <QWidget>
#include "renderthread.h"
+QT_BEGIN_NAMESPACE
class QLabel;
class QPushButton;
+QT_END_NAMESPACE
//! [Window class definition]
class Window : public QWidget
diff --git a/examples/corelib/threads/threads.pro b/examples/corelib/threads/threads.pro
index e47da84a06b..b9e17a84305 100644
--- a/examples/corelib/threads/threads.pro
+++ b/examples/corelib/threads/threads.pro
@@ -4,4 +4,6 @@ CONFIG += no_docs_target
SUBDIRS = semaphores \
waitconditions
-qtHaveModule(widgets): SUBDIRS += mandelbrot
+qtHaveModule(widgets): SUBDIRS += \
+ mandelbrot \
+ queuedcustomtype
--
GitLab