diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:25:01 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:25:01 (GMT) |
| commit | 6e6a3dba2336b158bcb3db633f429edc85534b3d (patch) | |
| tree | 65ebeb098fb7feff01ab5bdee833d9de889c9e44 /examples | |
| parent | 606aee01d1f23a5baceb4bd888b2a9d4716fcc34 (diff) | |
| parent | f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b (diff) | |
| download | Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.zip Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.tar.gz Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.tar.bz2 | |
Merge branch 'master' of ../qt into kinetic-declarativeui
Conflicts:
src/gui/widgets/qlinecontrol_p.h
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/ipc/ipc.pro | 3 | ||||
| -rw-r--r-- | examples/itemviews/chart/chart.pro | 2 | ||||
| -rw-r--r-- | examples/network/network.pro | 4 | ||||
| -rw-r--r-- | examples/painting/painterpaths/painterpaths.pro | 2 | ||||
| -rw-r--r-- | examples/qws/qws.pro | 4 | ||||
| -rw-r--r-- | examples/threads/mandelbrot/mandelbrot.pro | 2 |
6 files changed, 11 insertions, 6 deletions
diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro index 0698f89..9098936 100644 --- a/examples/ipc/ipc.pro +++ b/examples/ipc/ipc.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs -SUBDIRS = sharedmemory +# no QSharedMemory +!vxworks:!qnx:SUBDIRS = sharedmemory !wince*: SUBDIRS += localfortuneserver localfortuneclient # install diff --git a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro index d202451..7a9d197 100644 --- a/examples/itemviews/chart/chart.pro +++ b/examples/itemviews/chart/chart.pro @@ -4,7 +4,7 @@ RESOURCES = chart.qrc SOURCES = main.cpp \ mainwindow.cpp \ pieview.cpp -unix:!mac:LIBS+= -lm +unix:!mac:!vxworks:LIBS+= -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/itemviews/chart diff --git a/examples/network/network.pro b/examples/network/network.pro index 8c45745..adf998f 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -2,7 +2,6 @@ TEMPLATE = subdirs SUBDIRS = blockingfortuneclient \ broadcastreceiver \ broadcastsender \ - network-chat \ download \ downloadmanager \ fortuneclient \ @@ -14,6 +13,9 @@ SUBDIRS = blockingfortuneclient \ googlesuggest \ torrent +# no QProcess +!vxworks:!qnx:SUBDIRS += network-chat + contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient # install diff --git a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro index 76c9e82..98b9bd1 100644 --- a/examples/painting/painterpaths/painterpaths.pro +++ b/examples/painting/painterpaths/painterpaths.pro @@ -3,7 +3,7 @@ HEADERS = renderarea.h \ SOURCES = main.cpp \ renderarea.cpp \ window.cpp -unix:!mac:LIBS += -lm +unix:!mac:!vxworks:LIBS += -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths diff --git a/examples/qws/qws.pro b/examples/qws/qws.pro index fb3c3c7..95e1b44 100644 --- a/examples/qws/qws.pro +++ b/examples/qws/qws.pro @@ -1,5 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = framebuffer mousecalibration simpledecoration +# no /dev/fbX +!qnx:!vxworks:SUBDIRS = framebuffer +SUBDIRS += mousecalibration simpledecoration # install sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro diff --git a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro index 437f449..7870ca8 100644 --- a/examples/threads/mandelbrot/mandelbrot.pro +++ b/examples/threads/mandelbrot/mandelbrot.pro @@ -4,7 +4,7 @@ SOURCES = main.cpp \ mandelbrotwidget.cpp \ renderthread.cpp -unix:!mac:LIBS += -lm +unix:!mac:!vxworks:LIBS += -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot |