Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)

tomahawk-player / tomahawk

Tomahawk, the multi-source music player

http://tomahawk-player.org

GNU General Public License v3.0

2.95k stars 367 forks source link

Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) #648

Closed a17r closed 6 years ago

dschmidt commented 6 years ago

Why are you wrapping everything in if(Qt5Core_DIR)? It's not like anything can be built without QtCore...

a17r commented 6 years ago

The build system made me believe that Qt4 support is still a thing? If I don't wrap it like that, build with Qt4 would be broken.

dschmidt commented 6 years ago

Ah, we did not remove Qt4 support completely - but we don't support it either...

If we wanted to keep supporting it, I would vote for implementing the qt5_use_modules with the imported targets ... but I see no point in that. I suggest to remove the ifs.

@muesli thoughts?

a17r commented 6 years ago

I would be perfectly fine with the latter. There is really no point to jump through hoops for Qt4 support now.

a17r commented 6 years ago

Dropped the conditionals (but backupped the previous state of the branch)

dschmidt commented 6 years ago

Thanks!