diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-17 09:40:52 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-17 09:40:52 (GMT) |
| commit | dd678f7564955112b348a2fec56b29a8875e585e (patch) | |
| tree | d2415d20cb5a27c312150cd6ee93bce8d5129895 /mkspecs | |
| parent | 7d6af0213ab4f8797f98d0beb659fcf2f78a361b (diff) | |
| parent | bc01bb10da23d0d2308cf02a16947be836bc9a21 (diff) | |
| download | Qt-dd678f7564955112b348a2fec56b29a8875e585e.zip Qt-dd678f7564955112b348a2fec56b29a8875e585e.tar.gz Qt-dd678f7564955112b348a2fec56b29a8875e585e.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/hpux-g++-64/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/hpux-g++-64/qplatformdefs.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf index 38595c9..f76bd4e 100644 --- a/mkspecs/hpux-g++-64/qmake.conf +++ b/mkspecs/hpux-g++-64/qmake.conf @@ -15,7 +15,7 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +DA2.0W +QMAKE_CFLAGS = QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = -w @@ -51,7 +51,7 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ QMAKE_LINK_C = gcc QMAKE_LINK_C_SHLIB = gcc -QMAKE_LFLAGS = +DA2.0W -Wl,+s -lpthread +QMAKE_LFLAGS = -Wl,+s -lpthread QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -fPIC -shared diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h index a8d06d8..ac13799 100644 --- a/mkspecs/hpux-g++-64/qplatformdefs.h +++ b/mkspecs/hpux-g++-64/qplatformdefs.h @@ -145,7 +145,7 @@ #define QT_SIGNAL_ARGS int #define QT_SIGNAL_IGNORE SIG_IGN -#define QT_SOCKLEN_T int +#define QT_SOCKLEN_T socklen_t #endif // QPLATFORMDEFS_H |