diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/corelib/tools/tools.pri | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/corelib/tools/tools.pri')
| -rw-r--r-- | src/corelib/tools/tools.pri | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 2ec32fd9e9..21407fa9cd 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -95,7 +95,6 @@ SOURCES += \ SOURCES += tools/qelapsedtimer_mac.cpp OBJECTIVE_SOURCES += tools/qlocale_mac.mm } -else:symbian:SOURCES += tools/qelapsedtimer_symbian.cpp tools/qlocale_symbian.cpp else:unix:SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp else:win32:SOURCES += tools/qelapsedtimer_win.cpp tools/qlocale_win.cpp else:integrity:SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp @@ -131,5 +130,5 @@ INCLUDEPATH += ../3rdparty/md5 \ ../3rdparty/md4 # Note: libm should be present by default becaue this is C++ -!macx-icc:!vxworks:!symbian:unix:LIBS_PRIVATE += -lm +!macx-icc:!vxworks:unix:LIBS_PRIVATE += -lm |