diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-16 06:46:52 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-16 06:46:52 +1000 |
| commit | 7a4f4c7bbbee809186668a48cab025812a16d2ac (patch) | |
| tree | 8fcb04598146bd880889e33605f24db4541d3dbf /mkspecs | |
| parent | 19f53dd23c29d9a6b256ea1473b118abcde3cc5a (diff) | |
| parent | 2326a8d878e0d18473c27ddd54880621518b6e6e (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: (24 commits)
Amend qfiledialog INTEGRITY patch
Update to latest INTEGRITY Framebuffer API.
Remove support for tilde expansion as there is no home on INTEGRITY.
Remove docs and translations generation for INTEGRITY.
Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY.
Remove QT 3 API support by default for INTEGRITY.
Disable some tests because INTEGRITY doesn't support shared libraries.
Add specific INTEGRITY cases for autotests requiring a target path.
Improve default mkspec for INTEGRITY.
Use Q_FUNC_INFO without line number on GHS compiler.
Add INTEGRITY gbuild.* files to qmake project.
Use the project root from .gpj project files, instead of local path.
Make sure QMAKE_CXX is defined to prevent crashing on some projects.
Add support for .pro-type subdirectories.
Add relative path to the work directory, to prevent filename clashes.
Only call moc if the file needs it.
Use outname to specify the output .gpj to generate.
Use "dll" instead of "shared".
Instead of translating / into _, check if subdir is a .pro.
Do not generate -D defines for project types.
...
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/unsupported/integrity-ghs/qmake.conf | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf index 822d6bb5fa..803b2da7f1 100644 --- a/mkspecs/unsupported/integrity-ghs/qmake.conf +++ b/mkspecs/unsupported/integrity-ghs/qmake.conf @@ -7,9 +7,10 @@ MAKEFILE_GENERATOR = GBUILD TEMPLATE = app CONFIG += qt warn_on release integrity unix QT += core gui network +DEFINES += QT_NO_SHAREDMEMORY QT_NO_PROCESS QT_NO_QWS_MULTIPROCESS QT_NO_SYSTEMSEMAPHORE QT_NO_PRINTER QT_NO_QWS_QPF2 -QMAKE_CFLAGS = -bsp $$INTEGRITY_BSP -os_dir $__OS_DIR -QMAKE_CFLAGS += --diag_suppress=1,228,236,381,611,997 +QMAKE_CFLAGS = -bsp $$INTEGRITY_BSP -os_dir $__OS_DIR +QMAKE_CFLAGS += --diag_suppress=1,228,236,381,611,997,1795 QMAKE_CFLAGS_WARN_ON = QMAKE_CFLAGS_WARN_OFF = -w QMAKE_CFLAGS_RELEASE = -g -Ospeed -Olink --signed_fields --no_commons @@ -17,7 +18,7 @@ QMAKE_CFLAGS_DEBUG = -g --no_commons --signed_fields QMAKE_CFLAGS_SHLIB = QMAKE_CFLAGS_THREAD = -D_REENTRANT -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS --no_implicit_include --link_once_templates +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS --no_implicit_include --link_once_templates -non_shared QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE @@ -37,9 +38,9 @@ QMAKE_LIBDIR_OPENGL = QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib -QMAKE_LFLAGS = -lposix -livfs -lnet -lsocket -lfbdev -ldl +QMAKE_LFLAGS = -lposix -livfs -lnet -lsocket -lfbdev -lhiddev -ldl QMAKE_LFLAGS_RELEASE = -g -Ospeed -Olink --no_commons -non_shared --link_once_templates -QMAKE_LFLAGS_DEBUG = -g --no_commons +QMAKE_LFLAGS_DEBUG = -g --no_commons -non_shared --link_once_templates QMAKE_LFLAGS_SHLIB = QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = |