building Solid

[Dominik Haumann]

Hi,

a fresh Qt5 from stable branch, and a fresh frameworks build results in this error when building solid:

$ make
[  0%] Automatic moc for target KF5Solid
[  0%] Built target KF5Solid_automoc
[  1%] Building CXX object src/solid/CMakeFiles/KF5Solid.dir/managerbase.cpp.o
In file included from /home/dh/kde/kf5/src/frameworks/solid/src/solid/backends/udisks2/udisksmanager.h:25:0,
                 from /home/dh/kde/kf5/src/frameworks/solid/src/solid/managerbase.cpp:35:
/home/dh/kde/kf5/src/frameworks/solid/src/solid/backends/udisks2/udisks2.h:30:27: error: conflicting declaration ‘typedef class QList<QByteArray> QByteArrayList’
 typedef QList<QByteArray> QByteArrayList;
                           ^
In file included from /home/dh/kde/kf5/src/qt5/qtbase/include/QtCore/qbytearraylist.h:1:0,
                 from /home/dh/kde/kf5/src/qt5/qtbase/include/QtCore/QtCore:119,
                 from /home/dh/kde/kf5/src/qt5/qtbase/include/QtDBus/QtDBusDepends:2,
                 from /home/dh/kde/kf5/src/qt5/qtbase/include/QtDBus/QtDBus:3,
                 from /home/dh/kde/kf5/src/frameworks/solid/src/solid/backends/udisks2/udisks2.h:25,
                 from /home/dh/kde/kf5/src/frameworks/solid/src/solid/backends/udisks2/udisksmanager.h:25,
                 from /home/dh/kde/kf5/src/frameworks/solid/src/solid/managerbase.cpp:35:
/home/dh/kde/kf5/src/qt5/qtbase/src/corelib/tools/qbytearraylist.h:56:7: error: ‘class QByteArrayList’ has a previous declaration as ‘class QByteArrayList’
 class QByteArrayList : public QList<QByteArray>
       ^
make[2]: *** [src/solid/CMakeFiles/KF5Solid.dir/managerbase.cpp.o] Error 1
make[1]: *** [src/solid/CMakeFiles/KF5Solid.dir/all] Error 2
make: *** [all] Error 2

So QByteArrayList is once typedeffed in solid/backends/udisks2/udisks2.h, and once in QtCore/qbytearraylist.h
Is that intention?

Greetings,
Dominik