diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 09:25:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 09:25:06 (GMT) |
| commit | 8e6b240eef98060737324e33b09f4323ced58213 (patch) | |
| tree | 4a9235518c3dadff2bc563a3b6ddd46b3bad878e /mkspecs/aix-xlc/qmake.conf | |
| parent | 2044890bb807dc5879d7cbb1863c56c64249c3ef (diff) | |
| parent | 51b6c8a6e2713f2b151a522c75b2db5f0b0b663e (diff) | |
| download | Qt-8e6b240eef98060737324e33b09f4323ced58213.zip Qt-8e6b240eef98060737324e33b09f4323ced58213.tar.gz Qt-8e6b240eef98060737324e33b09f4323ced58213.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Implement some changes to the AIX xlC mkspec suggested by IBM.
Diffstat (limited to 'mkspecs/aix-xlc/qmake.conf')
| -rw-r--r-- | mkspecs/aix-xlc/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf index 42f6f7e..f4d77e5 100644 --- a/mkspecs/aix-xlc/qmake.conf +++ b/mkspecs/aix-xlc/qmake.conf @@ -48,7 +48,7 @@ QMAKE_LIBDIR_OPENGL = QMAKE_LINK = xlC QMAKE_LINK_THREAD = xlC_r QMAKE_LINK_SHLIB = ld -QMAKE_LFLAGS = +QMAKE_LFLAGS = -bmaxdata:0x80000000 QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -qmkshrobj |