Differential D22688

remove qt4
ClosedPublic
Actions

Authored by sitter on Jul 23 2019, 2:43 PM.

Details

Reviewers

dvratil

Commits

R487:0c977fb6d14c: remove qt4
R487:3afa51089156: remove qt4
R487:bf83c2d5a05e: remove qt4

Summary

Test Plan

builds and (seems) to install relevant files. phonon-vlc still builds as well

Diff Detail

Repository

R487 Phonon

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

sitter requested review of this revision.Jul 23 2019, 2:43 PM

sitter created this revision.

Harbormaster completed remote builds in B14330: Diff 62405.Jul 23 2019, 2:43 PM

fix soname

Harbormaster completed remote builds in B14440: Diff 62594.Jul 26 2019, 11:47 AM

I think we should also get rid of the QT_VERSION #ifdefs around the code...

declarative/plugin.cpp:#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
declarative/plugin.h:#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
designer/phononcollection.cpp:#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
designer/phononcollection.cpp:#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
phonon/globalstatic_p.h:#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) // Qt 4
phonon/globalstatic_p.h:#endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
phonon/experimental/packetpool.cpp:#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
phonon/experimental/packetpool.cpp:#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
phonon/platform.cpp:#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0) // QIcon::fromTheme was introduced in 4.6.0.
phonon/pulsesupport.cpp:#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
phonon/factory.cpp:#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
phonon/objectdescriptionmodel.cpp:#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) // Qt 5
phonon/objectdescriptionmodel.cpp:#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) // Qt 5
phonon/objectdescriptionmodel.cpp:#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) // Qt 5
phonon/objectdescriptionmodel.cpp:#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) // Qt 5

CMakeLists.txt
297	This used to use qt5_phonon.pri, but now you are using qt_phonon.pri as the source file - are those files identical, or should qt5_phonon.pri be renamed to qt_phonon.pri? Or should we keep qt5_phonon.pri and just drop the qt_phonon.pri?

dvratil requested changes to this revision.Jul 26 2019, 11:52 AM

This revision now requires changes to proceed.Jul 26 2019, 11:52 AM

There's a whole bunch of follow ups I have chained up, such as using ECM to generate the pri. This is purely about getting the build switched to qt5 by default. The ifdefs are a good point though.

also throw out QT_VERSION checks

Harbormaster completed remote builds in B14529: Diff 62722.Jul 29 2019, 10:26 AM

dvratil accepted this revision.Jul 29 2019, 12:07 PM

This revision is now accepted and ready to land.Jul 29 2019, 12:07 PM

sitter mentioned this in D22164: Enable PHONON_BUILD_PHONON4QT5 by default.Jul 29 2019, 1:07 PM

asturmlechner added a subscriber: asturmlechner.Jul 29 2019, 8:05 PM

Closed by commit R487:3afa51089156: remove qt4 (authored by sitter). · Explain WhyJul 30 2019, 12:27 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

		Path
M		CMakeLists.txt (88 lines)
M		cmake/CMakeLists.txt (1 line)
M		cmake/FindPhononInternal.cmake (6 lines)
D	M	cmake/PhononQt4.cmake (400 lines)
D	M	cmake/Qt4Macros.cmake (414 lines)
M		declarative/plugin.h (2 lines)
M		designer/phononcollection.cpp (6 lines)
M		phonon/CMakeLists.txt (20 lines)
M		phonon/experimental/packetpool.cpp (8 lines)
M		phonon/factory.cpp (11 lines)
M		phonon/globalstatic_p.h (50 lines)
M		phonon/mediaobject.h (3 lines)
M		phonon/mediaobject.cpp (174 lines)
M		phonon/mediaobject_p.h (41 lines)
M		phonon/objectdescription.h (4 lines)
M		phonon/objectdescriptionmodel.cpp (34 lines)
M		phonon/platform.cpp (2 lines)
M		phonon/pulsesupport.cpp (2 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	62405	2a59572		Jul 23 2019, 2:43 PM	★	★
Diff 2	62594	2a59572	fix soname	Jul 26 2019, 11:47 AM	★	★
Diff 3	62722	2a59572	also throw out QT_VERSION checks	Jul 29 2019, 10:26 AM	★	★
Diff 4	62788	2a59572	R487:3afa51089156d828d2ab045aecae847f2e88503f	Jul 30 2019, 12:20 PM	★	★