diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 19:17:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 19:17:07 +0200 |
| commit | e2776b44a0e0e34e5a1d851916a94f7db5e7bb7b (patch) | |
| tree | 7c428c524aa1b8cc42d3a581a8c13378ebd341b5 /mkspecs/hpux-g++-64/qmake.conf | |
| parent | 5c8aa27111fd51c8dff78fd0a276648aea08d4c1 (diff) | |
| parent | af2f1e14f61ee8d3a4ade723aed9618d1707f975 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenubar.mm
Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb
Diffstat (limited to 'mkspecs/hpux-g++-64/qmake.conf')
| -rw-r--r-- | mkspecs/hpux-g++-64/qmake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf index 8d598d7388..3e822edbfb 100644 --- a/mkspecs/hpux-g++-64/qmake.conf +++ b/mkspecs/hpux-g++-64/qmake.conf @@ -70,6 +70,7 @@ QMAKE_LIBS_YACC = -ly QMAKE_AR = ar cqs QMAKE_OBJCOPY = objcopy +QMAKE_NM = nm -P QMAKE_RANLIB = include(../common/unix.conf) |