path: root/examples/mainwindows
diff options
authorLars Knoll <>2011-07-06 13:55:40 +0200
committerLars Knoll <>2011-07-06 14:08:02 +0200
commit314fdbce8ce473eb3610be3658c61fab2fac0efb (patch)
tree98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /examples/mainwindows
parent8d7647e286e07690de15a6ff9189307ee1a3517c (diff)
parent83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff)
Merge remote branch 'gerrit/master' into refactor
Conflicts: config.tests/unix/opengldesktop/opengldesktop.cpp examples/itemviews/interview/ examples/mainwindows/mainwindow/ examples/openvg/README examples/richtext/textedit/ examples/tools/undo/ src/corelib/global/qglobal.h src/corelib/kernel/qcoreapplication.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qmetatype.h src/gui/kernel/qevent.cpp src/gui/kernel/qevent.h src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/gui/text/qfontdatabase.cpp src/opengl/qgl.h src/openvg/qpaintengine_vg.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp tests/auto/qmainwindow/ Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'examples/mainwindows')
4 files changed, 10 insertions, 38 deletions
diff --git a/examples/mainwindows/README b/examples/mainwindows/README
index 15a6c23e4b..b63adee6e3 100644
--- a/examples/mainwindows/README
+++ b/examples/mainwindows/README
@@ -5,36 +5,5 @@ separate forms of user input are unified in an integrated action system that
also supports keyboard shortcuts and accelerator keys in menu items.
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
link in the main Qt documentation.
-Finding the Qt Examples and Demos launcher
-On Windows:
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-On Mac OS X:
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-On Unix/Linux:
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-On all platforms:
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/mainwindows/macmainwindow/ b/examples/mainwindows/macmainwindow/
index 6773a669d0..8db88375f5 100644
--- a/examples/mainwindows/macmainwindow/
+++ b/examples/mainwindows/macmainwindow/
@@ -16,9 +16,9 @@ LIBS += -framework Cocoa -framework Carbon
# install
mac {
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/macmainwindow
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/macmainwindow
sources.files = $$SOURCES *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/macmainwindow
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/macmainwindow
INSTALLS += target sources
QT += widgets widgets
diff --git a/examples/mainwindows/mainwindow/ b/examples/mainwindows/mainwindow/
index bbb7c80a21..afe03a5788 100644
--- a/examples/mainwindows/mainwindow/
+++ b/examples/mainwindows/mainwindow/
@@ -9,10 +9,10 @@ build_all:!build_pass {
RESOURCES += mainwindow.qrc
# install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/mainwindow
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow
sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/mainwindow
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow
INSTALLS += target sources
-symbian: CONFIG += qt_demo
-QT += widgets widgets
+QT += widgets
+symbian: CONFIG += qt_example
diff --git a/examples/mainwindows/ b/examples/mainwindows/
index f685744228..9ed8e7aaff 100644
--- a/examples/mainwindows/
+++ b/examples/mainwindows/
@@ -1,10 +1,13 @@
TEMPLATE = subdirs
SUBDIRS = application \
+ mainwindow \
mdi \
menus \
recentfiles \
+mac* && !qpa: SUBDIRS += macmainwindow
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows