summaryrefslogtreecommitdiff
path: root/Tools/qmake
Commit message (Expand)AuthorAgeFilesLines
* Import QtWebKit commit 5e53102492e5ce85bda2657468f1369a0173c2ceKonstantin Tokarev2019-10-081-0/+2
* Import QtWebKit commit 68b093f76fd3ee458de9d1bbf54e1d5a648a71bdKonstantin Tokarev2019-09-111-0/+5
* Use libjpeg from Conan on Windows when Qt uses bundled copyKonstantin Tokarev2019-08-281-1/+1
* Import QtWebKit commit 58390740ab21cbf3ad8d7b51972c9b24fdf58a9cKonstantin Tokarev2019-08-131-1/+1
* Stop using bundled libjpeg from qtbaseKonstantin Tokarev2019-06-072-23/+3
* Temporarily skip MinGW buildKonstantin Tokarev2019-06-051-1/+1
* Import WebKit commit 025cd3fc8d29620535309aa3e2ab7075aad36044Konstantin Tokarev2018-01-201-0/+2
* Import WebKit commit a8b574fb3cd509a2d3f2a1568ad0a66d1bf0f6e8Konstantin Tokarev2018-01-111-3/+2
* Import WebKit commit 69d327017a8d700cbfc7e1120270db4d55416f41Konstantin Tokarev2018-01-071-4/+0
* Import WebKit commit 3b024218447b7838f08ccd8cf2c8515387ae41c2Konstantin Tokarev2017-12-212-1/+7
* Import WebKit commit 85c24b4e854b971f0705bb3411cfd4c0b821f491Konstantin Tokarev2017-10-131-3/+0
* Revert "Temporary disable VS2017"Konstantin Tokarev2017-09-201-1/+1
* Fix build with Qt 5.10 with moved zlibDmitry Shachnev2017-09-201-3/+5
* Merge remote-tracking branch 'origin/5.212' into devLiang Qi2017-07-041-3/+24
|\
| * Import WebKit commit 3c9fc2fb47474909f5c30b518d372c854a3ec433Konstantin Tokarev2017-06-301-3/+24
* | Temporary disable VS2017Konstantin Tokarev2017-07-031-1/+1
|/
* Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31Konstantin Tokarev2017-06-021-0/+44
* Import WebKit commit b25ce6eca994718717218f56d045e75a4a22f989wip/nextKonstantin Tokarev2017-05-081-9/+11
* Import WebKit commit 584c4a7a6a8bffb60f03b9eb10a65dbcf41dc0b7Konstantin Tokarev2017-04-221-6/+7
* Import WebKit commit 1686903dfa4ab621a1b16a1a87529c88b07414a6Konstantin Tokarev2017-04-111-2/+6
* Import WebKit commit 342c7c7c069db3ca1d09ae6c5f7d600f9b241778Konstantin Tokarev2017-04-071-3/+16
* Import WebKit commit 13ac532967b6ac2d18d6fc4ea72c4ca35eccff20Konstantin Tokarev2017-03-312-4/+2
* Import WebKit commit 17e8bfb1ff30314a838b9bf641c112f63a11dba4Konstantin Tokarev2017-03-262-1/+3
* Import WebKit commit 3da312bb5ff3deccba0a495b6ad6d5cafba56597Konstantin Tokarev2017-03-042-8/+18
* Imported WebKit commit bdab88b903fe1a254c80af20161183976670cd3bKonstantin Tokarev2017-02-022-0/+17
* Imported WebKit commit 30997fb33975697a4af9cc6eef69967313d0ec9aKonstantin Tokarev2017-02-021-1/+0
* Imported WebKit commit 12fbea815480c3b3fad139cd8dfb82e8c954bc9aKonstantin Tokarev2017-02-025-26/+31
* Imported WebKit commit a16099e901e36e6d298dd30c0694a2130052d70eKonstantin Tokarev2017-02-021-8/+21
* Imported WebKit commit 26dda242e41e9b4d348fc3573d86f58b9e8b51b9Konstantin Tokarev2017-02-025-0/+314
* Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)Konstantin Tokarev2017-02-0259-2499/+0
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-0/+4
|\
| * Define NOMINMAX on Windows buildsThiago Macieira2016-07-221-0/+4
* | fix logical mismerge from 5.6Oswald Buddenhagen2016-06-171-1/+1
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-154-4/+10
|\ \ | |/
| * fix ios device&simulator builds againOswald Buddenhagen2016-05-231-1/+3
| * Disable touch_slider if touch_events is disabled.Konstantin Tokarev2016-05-202-3/+4
| * Moved use_leveldb configuration from detectFeatures to sanitizeFeatures.Konstantin Tokarev2016-05-201-0/+3
| * QT_CONFIG simplification re debug_and_release and build_allOswald Buddenhagen2016-05-171-2/+1
| * Fix the build with non-standard qtlibinfix buildsThiago Macieira2016-05-111-1/+2
* | 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
|\