diff options
Diffstat (limited to 'examples/mainwindows')
-rw-r--r-- | examples/mainwindows/README | 33 | ||||
-rw-r--r-- | examples/mainwindows/macmainwindow/macmainwindow.pro | 4 | ||||
-rw-r--r-- | examples/mainwindows/mainwindow/mainwindow.pro | 8 | ||||
-rw-r--r-- | examples/mainwindows/mainwindows.pro | 3 |
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 -configured. - -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/macmainwindow.pro b/examples/mainwindows/macmainwindow/macmainwindow.pro index 6773a669d0..8db88375f5 100644 --- a/examples/mainwindows/macmainwindow/macmainwindow.pro +++ b/examples/mainwindows/macmainwindow/macmainwindow.pro @@ -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/mainwindow.pro b/examples/mainwindows/mainwindow/mainwindow.pro index bbb7c80a21..afe03a5788 100644 --- a/examples/mainwindows/mainwindow/mainwindow.pro +++ b/examples/mainwindows/mainwindow/mainwindow.pro @@ -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/mainwindows.pro b/examples/mainwindows/mainwindows.pro index f685744228..9ed8e7aaff 100644 --- 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 |