diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-21 10:32:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-21 10:32:32 (GMT) |
| commit | 6abd7066c7916fbafbf0b0b2b2a5fbbe8e017af9 (patch) | |
| tree | 78dcb4f70bc8ebddcb776001079baa46b21b494e /src/corelib | |
| parent | be04377b22475772e376a51017855a00cc732e80 (diff) | |
| parent | 04ad0950378fb4255064c10d5a4d64c1074035ed (diff) | |
| download | Qt-6abd7066c7916fbafbf0b0b2b2a5fbbe8e017af9.zip Qt-6abd7066c7916fbafbf0b0b2b2a5fbbe8e017af9.tar.gz Qt-6abd7066c7916fbafbf0b0b2b2a5fbbe8e017af9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
qdoc: Fixed html error, but the problem is still there.
qdoc: Changed number of columns to 1. Oila!
Doc: Changes to the HTMLGenerator, style and js
remove dead code that will never get called.
add bytes and activeTime to corelwan.
Fix formating of license header.
fix irix build
clarify wording of warning message
close scope while inside assignment only if the last char is a closing brace
deprecate undocumented -E option
use qtPrepareTool for qdoc
unify QMAKE_QMAKE path separator fixing
simplify arcane conditional, once again
qdoc: Propagate the language information into the XML as before.
Removed a change from the 4.7.0 change log.
Improve look and feel of itemviews on mac
doc: Fixed many broken links.
doc: Fixed many broken links.
update 4.7.0 changes
QPushButton's click area exceeds the button area by far on Mac OS X
...
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/corelib.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 83fa044..e39d326 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -3,6 +3,7 @@ QPRO_PWD = $$PWD QT = DEFINES += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000 +irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused include(../qbase.pri) include(animation/animation.pri) |