summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/gn_generator.prf
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2018-01-171-11/+0
|\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/webengine/api/qquickwebengineview_p_p.h src/webenginewidgets/api/qwebenginepage_p.h tests/auto/quick/qmltests/data/TestWebEngineView.qml Change-Id: Id2acc92e8d0364bdaaf5a63ea2d2cb9cd533ade3
| * Remove QT_LIBDIR_EGL/GLES2 leftoversMichal Klocek2018-01-021-11/+0
| | | | | | | | | | | | | | | | | | | | Since e812237b69 we do not longer use QT_LIBDIR_EGL and QT_LIBDIR_GLES2 to dynamically load gl libraries. Remove leftovers from gn generator. Task-number: QTBUG-65442 Change-Id: I045242b49be411373d36eb9c333916d27b0f169d Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* | Merge branch '5.10' into devAllan Sandfeld Jensen2017-10-131-1/+2
|\| | | | | | | Change-Id: I3a411e4019a5ec2f7d1a967b62a00ad7cf92f6f4
| * Add mkspecs include path to the gn buildPeter Varga2017-09-201-1/+2
| | | | | | | | | | | | | | | | | | INCLUDEPATH qmake variable doesn't contain mkspecs include path. Add it explicitly to the include_dirs gn variable in the gn generator. Change-Id: I454aa015794f258f588590b4662a16c04041c8fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Clean up remote devtools implementationAllan Sandfeld Jensen2017-10-131-17/+19
|/ | | | | | | | | Rename the file after the contents has been refactored being different classes, and switch to using Chromium discover HTML page which we now have available and which works. Change-Id: Ic04a56471be3a49e5d1dd4b1f914eda927272d89 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* Remove duplicate LC_RPATH values on macOSAlexandru Croitor2017-06-161-2/+1
| | | | | | | | | | | | | | | | | Starting with Qt 5.9, the values in QMAKE_RPATHDIR were passed along to GN, which resulted in both qmake and GN adding rpath linker flags, leading to duplicate rpath values. This lead to the Qt package installer not removing all absolute path rpath values when installing Qt, which subsequently caused issues with code signing Qt applications. The fix is not to pass the rpath values to GN, and rely on the ones generated by qmake. Task-number: QTBUG-61413 Change-Id: Ib27d9c232674534d4b053cb1e12750f5c8bc87a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Improve distcleanAllan Sandfeld Jensen2017-05-081-0/+2
| | | | | | | | Remove our manually generated configuration files on make distclean. Task-number: QTBUG-60235 Change-Id: I8b851fa80e1c17ea6ede9efb6ba0d2f108026db8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Move qmake files to standard locationsAllan Sandfeld Jensen2017-05-021-0/+244
The tools/qmake directory is a left over from webkit where qmake was but one of many buildsystems. This is not necessary for qtwebengine, so we can instead use the standard locations. Change-Id: I3d126d6627295b113b091f3eabeee25f1c1f6183 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 23:21:51 +0000