Wayne Chen
dd1cf1be6c
adding back deprecated UI toolkit
2018-11-07 14:25:39 -08:00
Wayne Chen
51586625e7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 12:02:38 -08:00
Alexander Ivash
4c6700b497
remove deprecations warnings
2018-11-06 14:21:14 +05:30
Alexander Ivash
fe4e4cfbd4
return controls-uit & styles-uit folders to preserve backward-compatibility
2018-11-06 14:21:14 +05:30
Alexander Ivash
27bb8a0de7
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles"
2018-10-23 10:58:28 -07:00
Alexander Ivash
740123b853
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03:00
vladest
fe5d7463fe
Merge branch 'master' into move_to_qqc2
2018-03-10 14:42:51 +01:00
Zach Fox
d0cc64f63d
Fix font loading for MacOS via different font loading method
2018-03-08 11:19:49 -08:00
vladest
148faa3a93
Merge branch 'master' into move_to_qqc2
2018-03-04 14:16:21 +01:00
Zach Fox
67034274fa
Improve font loading by using QRC instead of relative paths
2018-02-28 17:59:37 -08:00
vladest
0c13c2b6e2
Remove unused QQC1 imports
2017-11-13 16:37:28 +01:00
David Rowe
973fa28d3f
Fix case of RalewaySemiBold font name
2016-03-09 13:32:37 +13:00
David Rowe
aa32c1f1af
Restyle modal message dialog content
2016-02-23 17:54:02 +13:00
David Rowe
86bb1b1ed8
Make copy of TextEdit control for restyling
2016-02-23 17:44:11 +13:00
