diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-28 23:26:41 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-28 23:26:41 +1000 |
| commit | 54869c8727e5403cea866c99a5f83ae9c8533f82 (patch) | |
| tree | 631041adad66a2298177298b56c20028afe19f15 /examples | |
| parent | eedc18d1fdcf7c359916304cbf0b4629bbf70c84 (diff) | |
| parent | 86b42367d2ded7d3db06b1e087d8112a3171081a (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits)
fix autotest on windows (again)
fix autotest on windows
Ammend last INTEGRITY fix
Fix qmake build on Windows
fix test for QtLighthouse
add test for suppressing warnings in moc
Ammend INTEGRITY fixes
Store property editor's column positions in settings
add gsm to connectable bearer for networkmanager.
Fix license headers
add missing include
Silence GHS compiler
Run on INTEGRITY
Fix compilation on INTEGRITY
Do not link with libm on INTEGRITY
Add a "-nn" option to moc
Add Documentation about INTEGRITY RTOS
List the INTEGRITY drivers as well
Use TCP_LOCALSOCKET on INTEGRITY
Compile for systems without mmap
...
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/itemviews/chart/chart.pro | 2 | ||||
| -rw-r--r-- | examples/painting/painterpaths/painterpaths.pro | 2 | ||||
| -rw-r--r-- | examples/threads/mandelbrot/mandelbrot.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro index 53601f4f5c..12f08b9943 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:!symbian:!vxworks:LIBS+= -lm +unix:!mac:!symbian:!vxworks:!integrity:LIBS+= -lm TARGET.EPOCHEAPSIZE = 0x200000 0x800000 diff --git a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro index 1f42b41b61..d096fa6218 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:!symbian:!vxworks:LIBS += -lm +unix:!mac:!symbian:!vxworks:!integrity:LIBS += -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths diff --git a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro index ecbec56bb2..2db886b800 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:!symbian:!vxworks:LIBS += -lm +unix:!mac:!symbian:!vxworks:!integrity:LIBS += -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot |