Re: [Development] Desktop components: project directory structure

2012-05-09 Thread Laszlo Papp
> 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. Fwiw, we have done the same for

Re: [Development] Desktop components: project directory structure

2012-05-09 Thread morten.sorvig
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 th

Re: [Development] Desktop components: project directory structure

2012-05-09 Thread jens.bache-wiig
Mostly due to historical reasons. The desktop components were originally based on a concept of styled "custom" components developed in a separate branch on Gitorious: https://qt.gitorious.org/qt-components/qt-components/commits/custom The idea was that you can create a custom component with it's

Re: [Development] Desktop components: project directory structure

2012-05-08 Thread 1+1=2
I have no idea, And I hope that we can do some change for branch names: master ==> qt4 qt5==> master or simply merge qt5 ==> master Regards, Debao On Tue, May 8, 2012 at 9:45 AM, Alberto Mardegan wrote: > Hi all, >   I've got a question about the QML Desktop components at: > http

[Development] Desktop components: project directory structure

2012-05-08 Thread Alberto Mardegan
Hi all, I've got a question about the QML Desktop components at: https://qt.gitorious.org/qtplayground/qtdesktopcomponents Some components, such as TextField, are implemented as a derivative of another (homonymous) component defined in the "custom/" subdirectory. Why is this separation needed