Removed QTDIR so that the environment variable counts.
Added changes generated by running the build scripts.