1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove inclusion of -lm for INTEGRITY.

Browse Source 
Math functions are linked in by default on INTEGRITY.

Change-Id: I737ae87c02b2321caca3975f69525731e839d1a7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Rolland Dudemaine 2015-10-27 02:26:12 +01:00
parent 12c18ae647
commit d58596fd61
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/tools.pri
View File

@ -204,7 +204,7 @@ contains(QT_CONFIG, doubleconversion) {
} }
# Note: libm should be present by default becaue this is C++ # Note: libm should be present by default becaue this is C++
!macx-icc:!vxworks:!haiku:unix:LIBS_PRIVATE += -lm unix:!macx-icc:!vxworks:!haiku:!integrity: LIBS_PRIVATE += -lm
TR_EXCLUDE += ../3rdparty/* TR_EXCLUDE += ../3rdparty/*

2
tests/auto/corelib/tools/qline/qline.pro
View File

@ -2,4 +2,4 @@ CONFIG += testcase
TARGET = tst_qline TARGET = tst_qline
QT = core testlib QT = core testlib
SOURCES = tst_qline.cpp SOURCES = tst_qline.cpp
unix:!mac:!vxworks:!haiku:LIBS+=-lm unix:!darwin:!vxworks:!haiku:!integrity: LIBS+=-lm

2
tests/auto/gui/painting/qpathclipper/qpathclipper.pro
View File

@ -7,4 +7,4 @@ QT += gui-private testlib
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))
unix:!mac:!haiku:LIBS+=-lm unix:!darwin:!haiku:!integrity: LIBS += -lm

2
tests/auto/gui/painting/qpolygon/qpolygon.pro
View File

@ -3,6 +3,6 @@ TARGET = tst_qpolygon
QT += testlib QT += testlib
SOURCES += tst_qpolygon.cpp SOURCES += tst_qpolygon.cpp
unix:!mac:!haiku:LIBS+=-lm unix:!darwin:!haiku:!integrity: LIBS += -lm

2
tests/auto/gui/painting/qtransform/qtransform.pro
View File

@ -3,4 +3,4 @@ TARGET = tst_qtransform
SOURCES += tst_qtransform.cpp SOURCES += tst_qtransform.cpp
QT += testlib QT += testlib
unix:!mac:!haiku:LIBS+=-lm unix:!darwin:!haiku:!integrity: LIBS += -lm

2
tests/auto/gui/painting/qwmatrix/qwmatrix.pro
View File

@ -3,4 +3,4 @@ TARGET = tst_qwmatrix
SOURCES += tst_qwmatrix.cpp SOURCES += tst_qwmatrix.cpp
QT += testlib QT += testlib
unix:!mac:!haiku:LIBS+=-lm unix:!darwin:!haiku:!integrity: LIBS += -lm

2
tests/auto/other/qaccessibility/qaccessibility.pro
View File

@ -5,7 +5,7 @@ QT += testlib core-private gui-private widgets-private
SOURCES += tst_qaccessibility.cpp SOURCES += tst_qaccessibility.cpp
HEADERS += accessiblewidgets.h HEADERS += accessiblewidgets.h
unix:!mac:!haiku:LIBS+=-lm unix:!darwin:!haiku:!integity: LIBS += -lm
wince { wince {
accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll