diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-07-17 23:31:36 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-07-17 23:31:36 (GMT) |
| commit | 8d545a21b6aa89675b404a9d7bf08b7499d26e5e (patch) | |
| tree | 761c900e05538a337517435d5337392f7fc8931d /configure | |
| parent | 571b85896ee3663479b4a10d2418e2e19b3639f3 (diff) | |
| parent | d61c74faef2ed787aacc53c03b8361fa57bccc8e (diff) | |
| download | Qt-8d545a21b6aa89675b404a9d7bf08b7499d26e5e.zip Qt-8d545a21b6aa89675b404a9d7bf08b7499d26e5e.tar.gz Qt-8d545a21b6aa89675b404a9d7bf08b7499d26e5e.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7-from-4.6
Conflicts:
tests/auto/qtexttable/tst_qtexttable.cpp
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -4481,11 +4481,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi mv -f "$QMAKE_QCONFIG_H" "$QCONFIG_H" - for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do - if [ '!' -f "$conf" ]; then - ln -s "$QCONFIG_H" "$conf" - fi - done #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured rm -f mkspecs/default @@ -7751,7 +7746,7 @@ EOF # Ensure we can link to uninistalled libraries if [ "$XPLATFORM_MINGW" != "yes" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then - echo "QMAKE_LFLAGS += -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib" >> "$CACHEFILE.tmp" + echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$CACHEFILE.tmp" fi if [ -n "$QT_CFLAGS_PSQL" ]; then |