- Committer: Frederik Gladhorn
- Date: 2015-01-19 13:06:55 UTC
- mfrom: (236.1.21)
- Revision ID: git-v1:79f2b17b3e08e6a18e3c02dea98620ad372042eb
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I7b5322df40680614250e1e6327879ff683c03df5
Conflicts:
.qmake.conf
Change-Id: I7b5322df40680614250e1e6327879ff683c03df5
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
dist
|
189 | 11 years ago | Frederik Gladhorn | Merge remote-tracking branch 'origin/stable' into |
|
||
|
doc
|
1 | 13 years ago | axis | Initial import from the monolithic Qt. This is th |
|
||
|
examples
|
1 | 13 years ago | axis | Initial import from the monolithic Qt. This is th |
|
||
|
src
|
1 | 13 years ago | axis | Initial import from the monolithic Qt. This is th |
|
||
|
tests
|
1 | 13 years ago | axis | Initial import from the monolithic Qt. This is th |
|
||
|
util
|
1 | 13 years ago | axis | Initial import from the monolithic Qt. This is th |
|
||
.gitattributes |
161 | 11 years ago | Qt by Nokia | Update the git-archive export options The .gitatt | 89 bytes |
|
|
|
.gitignore |
236.1.5 | 9 years ago | Rainer Keller | Remove qtdemo from gitignore QtDemo was removed w | 4 KB |
|
|
|
.qmake.conf |
237 | 9 years ago | Oswald Buddenhagen | Bump version Change-Id: Ie35bb9482c3294c227b6fd24 | 76 bytes |
|
|
|
.tag |
161 | 11 years ago | Qt by Nokia | Update the git-archive export options The .gitatt | 12 bytes |
|
|
|
LGPL_EXCEPTION.txt |
187.1.25 | 11 years ago | The Qt Project | Add license files mandated by (L)GPL. Currently o | 1.1 KB |
|
|
|
LICENSE.FDL |
187.1.25 | 11 years ago | The Qt Project | Add license files mandated by (L)GPL. Currently o | 22.4 KB |
|
|
|
LICENSE.GPLv2 |
236.1.1 | 9 years ago | Jani Heikkinen | Update license headers and add new license files | 15 KB |
|
|
|
LICENSE.LGPLv21 |
236.1.1 | 9 years ago | Jani Heikkinen | Update license headers and add new license files | 26.2 KB |
|
|
|
LICENSE.LGPLv3 |
236.1.1 | 9 years ago | Jani Heikkinen | Update license headers and add new license files | 7.8 KB |
|
|
|
qtscript.pro |
226 | 10 years ago | The Qt Project | Exclude WinRT from build Change-Id: I36de2011fa78 | 33 bytes |
|
|
|
sync.profile |
187.1.41 | 10 years ago | The Qt Project | sync.profile: Point dependencies to an empty strin | 721 bytes |
|
|