[Development] Desktop components: project directory structure

[morten.sorvig at nokia.com]

On May 8, 2012, at 9:09 PM, ext 1+1=2 wrote:
> 
> And I hope that we can do some change for branch names:
> 
> master  ==>  qt4
> qt5        ==>  master
> 
> or simply merge qt5 ==> master


I want to work towards having one branch by merging over the differences and using Qt version ifdefs. I think this approach has worked well for Qt Creator on Qt 5, where we have one canonical Creator master branch and not a Qt 5 branch which lags behind. We are going to run into QML import version checking though ("import QtQuick 1.1"  vs "import QtQuick 2.0") .

If we end up with two branches we should probably change the names as you point out, but let's get them synced up first.

Morten