diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-29 13:01:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-29 13:01:55 (GMT) |
| commit | e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14 (patch) | |
| tree | 2832e2565aed90653ded8c3d324974b16aab338c /mkspecs/macx-xcode | |
| parent | 0a502ef47f1c6bf06c28dd966b63e3963cd2f630 (diff) | |
| parent | 013df7417f1496f476c23251a90aa454687d2f74 (diff) | |
| download | Qt-e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14.zip Qt-e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14.tar.gz Qt-e6f5fc28e82732dd214d87bd6c6a8a2efbf89f14.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Set execution bits for more scripts.
Set execution bits for .test files.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
Diffstat (limited to 'mkspecs/macx-xcode')
| -rw-r--r--[-rwxr-xr-x] | mkspecs/macx-xcode/Info.plist.app | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | mkspecs/macx-xcode/qmake.conf | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/mkspecs/macx-xcode/Info.plist.app b/mkspecs/macx-xcode/Info.plist.app index 393b615..393b615 100755..100644 --- a/mkspecs/macx-xcode/Info.plist.app +++ b/mkspecs/macx-xcode/Info.plist.app diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf index 4cb4626..4cb4626 100755..100644 --- a/mkspecs/macx-xcode/qmake.conf +++ b/mkspecs/macx-xcode/qmake.conf |