Add the mainwindows demos-examples to the build.

Change-Id: I6ec0be8f058ad127c759fff3c4082a596db53405
Reviewed-on: http://codereview.qt.nokia.com/752
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kevin Wright <kevin.wright@nokia.com>

diff --git a/examples/mainwindows/macmainwindow/macmainwindow.pro b/examples/mainwindows/macmainwindow/macmainwindow.pro
index 4359056..3ababcc 100644 (file)
--- a/examples/mainwindows/macmainwindow/macmainwindow.pro
+++ b/examples/mainwindows/macmainwindow/macmainwindow.pro
@@ -16,8 +16,8 @@ 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
 }

diff --git a/examples/mainwindows/mainwindow/mainwindow.pro b/examples/mainwindows/mainwindow/mainwindow.pro
index 6da113d..1790224 100644 (file)
--- a/examples/mainwindows/mainwindow/mainwindow.pro
+++ b/examples/mainwindows/mainwindow/mainwindow.pro
@@ -9,9 +9,9 @@ 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
+symbian: CONFIG += qt_example

diff --git a/examples/mainwindows/mainwindows.pro b/examples/mainwindows/mainwindows.pro
index 7301c96..d570a24 100644 (file)
--- a/examples/mainwindows/mainwindows.pro
+++ b/examples/mainwindows/mainwindows.pro
@@ -1,10 +1,13 @@
 TEMPLATE      = subdirs
 SUBDIRS       = application \
+                mainwindow \
                 mdi \
                 menus \
                 recentfiles \
                 sdi
 
+mac* && !qpa: SUBDIRS += macmainwindow
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README