summaryrefslogtreecommitdiffstats
path: root/mkspecs/linux-icc/qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
...
* Disable ICC diagnostic 2261 about __assume with side-effectsThiago Macieira2012-03-271-1/+1
| | | | | | | | | | | | The warning is presented now that we use __assume in every Q_ASSERT. It presents itself in code that calls functions, like: tools/qbitarray.h(128): warning #2261: __assume expression with side effects discarded { Q_ASSERT(i >= 0 && i < size()); ^ Change-Id: I5851b3c35b56c00b9c541c2489233121ef621e04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update the Linux-ICC mkspecThiago Macieira2012-03-221-9/+1
| | | | | | | | | | | Include linux.conf instead of unix.conf, so it can compile Qt Base these days (otherwise, we get an error from wayland-scanner.prf). Remove the outdated information from the header. The mkspec now matches ICC 12, not 10 and there are more diagnostics we disable. Change-Id: Ic75593759a4d53f859a9a9e919d77b5c52d01024 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecsOswald Buddenhagen2012-03-011-3/+0
| | | | | | | | there is entirely no point in having it there. Change-Id: Ie2fc1e94495119725131cbd50564648cbb4a7dc8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Don't hard-code paths to /usr/X11R6 in linux-mkspecsTor Arne Vestbø2012-02-141-4/+4
| | | | | | | | | It was causing issues when cross-compiling with a sysroot, as the paths were not prefixed with the sysroot. The right include paths should be taken care of by pkgconfig anyways. Change-Id: I2cf7bf6377c88e6bf3b015100444d082530337ec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+111
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12