Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
-rw-r--r-- 324 .commit-template
-rw-r--r-- 3920 .gitignore
-rwxr-xr-x 2283 .hgignore
-rw-r--r-- 742 INSTALL
-rw-r--r-- 1187 LGPL_EXCEPTION.txt
-rw-r--r-- 22961 LICENSE.FDL
-rw-r--r-- 26835 LICENSE.LGPL
-rw-r--r-- 31573 LICENSE.PREVIEW.COMMERCIAL
drwxr-xr-x - bin
drwxr-xr-x - config.tests
-rwxr-xr-x 303459 configure
-rwxr-xr-x 1329152 configure.exe
drwxr-xr-x - demos
drwxr-xr-x - dist
drwxr-xr-x - doc
drwxr-xr-x - examples
-rw-r--r-- 2044 header.BSD
-rw-r--r-- 862 header.FDL
-rw-r--r-- 1714 header.LGPL
-rw-r--r-- 986 header.LGPL-ONLY
drwxr-xr-x - imports
drwxr-xr-x - lib
drwxr-xr-x - mkspecs
-rw-r--r-- 6962 projects.pro
drwxr-xr-x - qmake
drwxr-xr-x - src
drwxr-xr-x - templates
drwxr-xr-x - tests
drwxr-xr-x - tools
drwxr-xr-x - translations
drwxr-xr-x - util