summaryrefslogtreecommitdiff
path: root/Tools/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6.1' into 5.7.05.7.0Liang Qi2016-05-274-4/+41
|\
| * Allow building QtWebKit on Windows with non-ICU Qt build.Konstantin Tokarev2016-04-052-3/+1
| * Allow using system SQLite without pkg-configKonstantin Tokarev2016-04-013-1/+40
| * Fix linking with libpthreadAllan Sandfeld Jensen2016-02-261-0/+1
* | Crude hack to disable build on Ubuntu TouchSimon Hausmann2016-02-231-0/+3
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Simon Hausmann2016-02-222-2/+6
|\ \ | |/
| * Skip building on androidAllan Sandfeld Jensen2016-02-031-1/+4
| * Fix link error in MSVCKai Koehne2015-11-161-1/+2
* | Fix linking with libpthreadAllan Sandfeld Jensen2016-02-221-0/+1
|/
* Added workaround for use_system_malloc to omit WTF_ prefix in macro name.Konstantin Tokarev2015-09-301-0/+4
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-191-3/+0
|\
| * call flex by its standard nameAndrew Knight2015-08-131-3/+0
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-181-0/+3
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1Allan Sandfeld Jensen2015-03-101-0/+3
| |\
| | * Fix JavaScript on ARMv7 in ARM-modeAllan Sandfeld Jensen2015-03-021-0/+3
* | | use the official way to detect the use of the windows shellOswald Buddenhagen2015-03-061-1/+1
|/ /
* | Update copyright headersJani Heikkinen2015-02-162-8/+8
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-164-3/+11
|\ \ | |/
| * enable static compilation for WindowsAshish Kulkarni2015-01-081-1/+1
| * fix linker errors for the static Windows buildMilian Wolff2015-01-081-1/+1
| * fix detection of ICU when configuring for WindowsAshish Kulkarni2015-01-081-0/+1
| * fix detection of zlib when configuring for WindowsAshish Kulkarni2015-01-081-1/+8
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-173-5/+7
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-12-171-1/+2
| |\
| | * Fix disabling of aliasing for all gcc alike compilersSimon Hausmann2014-11-291-1/+2
| * | Make QtWebKit configure report the right configurationAllan Sandfeld Jensen2014-12-041-4/+3
| * | Do not use gold linker with stabs debug formatAllan Sandfeld Jensen2014-12-031-0/+2
| |/
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-271-0/+1
|\ \ | |/
| * Disable the build on Windows RT / Windows PhoneSimon Hausmann2014-10-231-0/+1
* | Fix typo - sanitizeFeaturesFrederik Gladhorn2014-10-232-2/+2
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-206-7/+16
|\ \ | |/
| * Remove QtScript includesAllan Sandfeld Jensen2014-10-161-2/+1
| * Fix android compile.BogDan Vatra2014-10-152-1/+3
| * Check for ICU at configure time the same way we add it laterAllan Sandfeld Jensen2014-10-141-0/+2
| * Load flags used by Qt modules when compile testing for a moduleAllan Sandfeld Jensen2014-10-133-0/+6
| * Support building QtTestBrowser without QtTestSupportv5.4.0-beta1Allan Sandfeld Jensen2014-10-102-4/+4
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-094-3/+70
|\ \ | |/
| * Support DynamicGL buildsAllan Sandfeld Jensen2014-10-021-1/+5
| * Implement ICU availability check in qtwebkitKai Koehne2014-09-293-2/+65
* | Enable QtWebKitWidgets on QNXAllan Sandfeld Jensen2014-10-011-2/+7
|/
* Remove code dealing with separate-debug-info on its ownAllan Sandfeld Jensen2014-09-171-6/+1
* Fix crossbuilding QtWebKit from Windowsv5.4.0-alpha1Allan Sandfeld Jensen2014-09-063-3/+3
* Fix non production_build buildsAllan Sandfeld Jensen2014-08-162-4/+8
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-103-1/+5
|\
| * Actually load icc.prf for the Intel compilerThiago Macieira2014-07-023-1/+5
* | Implement Accelerated 2D CanvasAllan Sandfeld Jensen2014-07-032-1/+4
|/
* Fix debug builds of qtwebkit on linux-iccAllan Sandfeld Jensen2014-06-251-1/+1
* Reduce the command line length when generating bindingsJocelyn Turcotte2014-05-051-0/+8
* Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/s...Jani Heikkinen2014-04-241-2/+2
|\
| * Fix build on AndroidAllan Sandfeld Jensen2014-04-161-2/+2
View Lorry Controller Status