Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • Thrillseekr/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
400 results
Show changes
Commits on Source (15)
Showing
with 10 additions and 146 deletions
......@@ -45,11 +45,7 @@ void EPGGraphicsScene::drawBackground( QPainter *painter, const QRectF &rect)
/* day change */
QDateTime rectstarttime = epgView->startTime().addSecs( rect.left() );
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QDateTime nextdaylimit = rectstarttime.date().startOfDay();
#else
QDateTime nextdaylimit = QDateTime( rectstarttime.date() );
#endif
QRectF area( rect );
while( area.left() < width() )
......
......@@ -63,13 +63,7 @@
static bool filterIsPresent( const QString &filters, const QString &filter )
{
QStringList list = filters.split( ':',
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
Qt::SkipEmptyParts
#else
QString::SkipEmptyParts
#endif
);
QStringList list = filters.split( ':', Qt::SkipEmptyParts );
foreach( const QString &filterCmp, list )
{
......@@ -306,13 +300,7 @@ static QString ChangeFiltersString( qt_intf_t *p_intf, const char *psz_filter_ty
char* psz_chain = var_GetString( p_intf, psz_filter_type );
QString const chain = QString( psz_chain ? psz_chain : "" );
QStringList list = chain.split( ':',
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
Qt::SkipEmptyParts
#else
QString::SkipEmptyParts
#endif
);
QStringList list = chain.split( ':', Qt::SkipEmptyParts );
if( b_add && std::find(list.begin(), list.end(), psz_name) == list.end() )
list << psz_name;
......@@ -1004,13 +992,7 @@ QStringList EqualizerSliderData::getBandsFromAout() const
char *psz_bands = var_GetString( p_aout.get(), qtu(p_data->name) );
if ( psz_bands )
{
bands = QString( psz_bands ).split( " ",
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
Qt::SkipEmptyParts
#else
QString::SkipEmptyParts
#endif
);
bands = QString( psz_bands ).split( " ", Qt::SkipEmptyParts );
free( psz_bands );
}
}
......@@ -1025,13 +1007,7 @@ QStringList EqualizerSliderData::getBandsFromAout() const
char *psz_bands = config_GetPsz( qtu(p_data->name) );
if ( psz_bands )
{
bands = QString( psz_bands ).split( " ",
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
Qt::SkipEmptyParts
#else
QString::SkipEmptyParts
#endif
);
bands = QString( psz_bands ).split( " ", Qt::SkipEmptyParts );
free( psz_bands );
}
......
......@@ -137,9 +137,7 @@ void FirstRunWizard::finish()
/* Layout Page settings */
config_PutInt( "qt-menubar", ui.layoutGroup->checkedId() );
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
config_PutInt( "qt-titlebar", ui.layoutGroup->checkedId() );
#endif
config_PutInt( "qt-pin-controls", ui.layoutGroup->checkedId() );
......@@ -311,9 +309,7 @@ void FirstRunWizard::reject()
/* Layout Page settings */
config_PutInt( "qt-menubar", 0 );
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
config_PutInt( "qt-titlebar", 0 );
#endif
p_intf->p_mi->setPinVideoControls( 0 );
p_intf->p_mi->controlbarProfileModel()->setSelectedProfileFromId(ControlbarProfileModel::DEFAULT_STYLE);
......
......@@ -599,13 +599,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
connect( ui.volNormBox, &QCheckBox::toggled, ui.volNormSpin, &QDoubleSpinBox::setEnabled );
char* psz = config_GetPsz( "audio-filter" );
qs_filter = qfu( psz ).split( ':',
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
Qt::SkipEmptyParts
#else
QString::SkipEmptyParts
#endif
);
qs_filter = qfu( psz ).split( ':', Qt::SkipEmptyParts );
free( psz );
......@@ -794,9 +788,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
/*Update layout radio buttons based on the checkState of the following checkboxes*/
connect(ui.menuBarCheck, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
connect(ui.pinVideoControlsCheckbox, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
connect(ui.titleBarCheckBox, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
#endif
/*Clicking on image will check the corresponding layout radio button*/
layoutImages = new QButtonGroup( this );
......@@ -807,13 +799,8 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
connect( layoutImages, qOverload<QAbstractButton*>( &QButtonGroup::buttonClicked ), this, &SPrefsPanel::imageLayoutClick );
/* Set checkboxes depending on the layout selected*/
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
connect(radioGroup, &QButtonGroup::idClicked, this, &SPrefsPanel::handleLayoutChange);
connect(layoutImages, &QButtonGroup::idClicked, this, &SPrefsPanel::handleLayoutChange);
#else
connect(radioGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &SPrefsPanel::handleLayoutChange);
connect(layoutImages, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &SPrefsPanel::handleLayoutChange);
#endif
configBool( "embedded-video", ui.embedVideo );
configBool( "qt-video-autoresize", ui.resizingBox );
......@@ -884,11 +871,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
QObject::connect( ui.toolbarEditor, &QAbstractButton::clicked, provider, &DialogsProvider::showToolbarEditorDialog);
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
configBool( "qt-titlebar", ui.titleBarCheckBox );
#else
ui.titleBarCheckBox->hide();
#endif
/* UPDATE options */
#ifdef UPDATE_CHECK
......@@ -1156,18 +1139,14 @@ void SPrefsPanel::handleLayoutChange( int id )
// Modern layout selected
ui.styleStackedWidget->setCurrentIndex(0);
ui.menuBarCheck->setChecked(false);
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
ui.titleBarCheckBox->setChecked(false);
#endif
ui.pinVideoControlsCheckbox->setChecked(false);
}
else if (id == 1) {
// Classic layout selected
ui.styleStackedWidget->setCurrentIndex(0);
ui.menuBarCheck->setChecked(true);
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
ui.titleBarCheckBox->setChecked(true);
#endif
ui.pinVideoControlsCheckbox->setChecked(true);
}
else if (id == 2) {
......@@ -1179,17 +1158,13 @@ void SPrefsPanel::updateLayoutSelection()
{
auto ui = m_interfaceUI;
bool isModern = !ui.menuBarCheck->isChecked()
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
&& !ui.titleBarCheckBox->isChecked()
#endif
&& !ui.pinVideoControlsCheckbox->isChecked();
ui.modernButton->setChecked(isModern);
bool isClassic = ui.menuBarCheck->isChecked()
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
&& ui.titleBarCheckBox->isChecked()
#endif
&& ui.pinVideoControlsCheckbox->isChecked();
ui.classicButton->setChecked(isClassic);
......
......@@ -637,13 +637,7 @@ void VLMWrapper::EditBroadcast( const QString& name, const QString& input,
vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
vlm_MessageDelete( message );
QStringList options = inputOptions.split( " :",
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
Qt::SkipEmptyParts
#else
QString::SkipEmptyParts
#endif
);
QStringList options = inputOptions.split( " :", Qt::SkipEmptyParts );
for( int i = 0; i < options.count(); i++ )
{
......@@ -735,13 +729,7 @@ void VLMWrapper::EditSchedule( const QString& name, const QString& input,
vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
vlm_MessageDelete( message );
QStringList options = inputOptions.split( " :",
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
Qt::SkipEmptyParts
#else
QString::SkipEmptyParts
#endif
);
QStringList options = inputOptions.split( " :", Qt::SkipEmptyParts );
for( int i = 0; i < options.count(); i++ )
{
command = "setup \"" + name + "\" option \"" + options[i].trimmed() + "\"";
......
......@@ -285,25 +285,19 @@ bool X11DamageObserver::init()
return true;
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
//can't use QOverload with private signals
template<class T>
static auto privateOverload(void (QSocketNotifier::* s)( QSocketDescriptor,QSocketNotifier::Type, T) )
{
return s;
}
#endif
void X11DamageObserver::start()
{
//listen to the x11 socket instead of blocking
m_socketNotifier = new QSocketNotifier(m_connFd, QSocketNotifier::Read, this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
connect(m_socketNotifier, privateOverload(&QSocketNotifier::activated),
this, &X11DamageObserver::onEvent);
#else
connect(m_socketNotifier, &QSocketNotifier::activated, this, &X11DamageObserver::onEvent);
#endif
}
bool X11DamageObserver::onRegisterSurfaceDamage(unsigned int wid)
......
......@@ -118,10 +118,8 @@ InterfaceWindowHandler::InterfaceWindowHandler(qt_intf_t *_p_intf, MainCtx* main
connect(this, &InterfaceWindowHandler::incrementIntfUserScaleFactor,
m_mainCtx, &MainCtx::incrementIntfUserScaleFactor);
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
connect( m_mainCtx, &MainCtx::useClientSideDecorationChanged,
this, &InterfaceWindowHandler::updateCSDWindowSettings );
#endif
connect(m_mainCtx, &MainCtx::requestInterfaceMaximized,
this, &InterfaceWindowHandler::setInterfaceMaximized);
......@@ -144,14 +142,12 @@ InterfaceWindowHandler::~InterfaceWindowHandler()
QVLCTools::saveWindowPosition(getSettings(), m_window);
}
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
void InterfaceWindowHandler::updateCSDWindowSettings()
{
m_window->hide(); // some window managers don't like to change frame window hint on visible window
m_window->setFlag(Qt::FramelessWindowHint, m_mainCtx->useClientSideDecoration());
m_window->show();
}
#endif
bool InterfaceWindowHandler::eventFilter(QObject*, QEvent* event)
{
......@@ -225,11 +221,7 @@ bool InterfaceWindowHandler::eventFilter(QObject*, QEvent* event)
QWheelEvent* wheelEvent = static_cast<QWheelEvent*>(event);
if (wheelEvent->modifiers() == Qt::ControlModifier)
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
emit incrementIntfUserScaleFactor(wheelEvent->angleDelta().y() > 0);
#else
emit incrementIntfUserScaleFactor(wheelEvent->delta() > 0);
#endif
wheelEvent->accept();
return true;
}
......
......@@ -64,9 +64,7 @@ signals:
private:
bool applyKeyEvent(QKeyEvent * event) const;
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
virtual void updateCSDWindowSettings();
#endif
protected:
qt_intf_t* p_intf = nullptr;
......
......@@ -341,9 +341,7 @@ void MainCtx::loadPrefs(const bool callSignals)
loadFromVLCOption(m_hasToolbarMenu, "qt-menubar", &MainCtx::hasToolbarMenuChanged);
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
loadFromVLCOption(m_windowTitlebar, "qt-titlebar" , &MainCtx::useClientSideDecorationChanged);
#endif
loadFromVLCOption(m_smoothScroll, "qt-smooth-scrolling", &MainCtx::smoothScrollChanged);
......
......@@ -797,11 +797,7 @@ void MainCtxWin32::reloadPrefs()
InterfaceWindowHandlerWin32::InterfaceWindowHandlerWin32(qt_intf_t *_p_intf, MainCtx* mainCtx, QWindow* window, QObject *parent)
: InterfaceWindowHandler(_p_intf, mainCtx, window, parent)
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
, m_CSDWindowEventHandler(new CSDWin32EventHandler(mainCtx, window, window))
#endif
{
auto systemMenuButton = std::make_shared<WinSystemMenuButton>(mainCtx->intfMainWindow(), nullptr);
mainCtx->csdButtonModel()->setSystemMenuButton(systemMenuButton);
......@@ -984,9 +980,7 @@ bool InterfaceWindowHandlerWin32::eventFilter(QObject* obj, QEvent* ev)
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
void InterfaceWindowHandlerWin32::updateCSDWindowSettings()
{
static_cast<CSDWin32EventHandler *>(m_CSDWindowEventHandler)->setUseClientSideDecoration(m_mainCtx->useClientSideDecoration());
}
#endif
......@@ -80,10 +80,8 @@ protected:
bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
private:
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
void updateCSDWindowSettings() override;
QObject *m_CSDWindowEventHandler {};
#endif
};
#endif // MAIN_INTERFACE_WIN32_HPP
......@@ -102,18 +102,6 @@ public:
template<class T>
QPointer<T> SingletonRegisterHelper<T>::m_instance = nullptr;
template<class T>
void registerAnonymousType( const char *uri, int versionMajor )
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
qmlRegisterAnonymousType<T>( uri, versionMajor );
#else
qmlRegisterType<T>();
VLC_UNUSED( uri );
VLC_UNUSED( versionMajor );
#endif
}
} // anonymous namespace
......
......@@ -73,12 +73,7 @@ QHash<int, QByteArray> MLVideoGroupsModel::roleNames() const /* override */
{GROUP_COUNT, "count"},
};
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
for (auto i = groupRoles.begin(); i != groupRoles.end(); ++i)
hash.insert(i.key(), i.value());
#else
hash.insert(groupRoles);
#endif
return hash;
}
......
......@@ -221,11 +221,7 @@ CheckableListMenu::CheckableListMenu(QString title, QAbstractListModel* model ,
m_actionGroup = new QActionGroup(this);
if (m_grouping == GROUPED_OPTIONAL)
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
m_actionGroup->setExclusionPolicy(QActionGroup::ExclusionPolicy::ExclusiveOptional);
#else
m_actionGroup->setExclusive(false);
#endif
}
}
......
......@@ -164,7 +164,6 @@ AbstractButton {
Layout.fillHeight: true
Binding on visible {
delayed: (MainCtx.qtVersion() < MainCtx.qtVersionCheck(5, 15, 8))
value: (infoColumn.height > infoColumn.implicitHeight) && (artistLabel.text.length > 0)
}
......
......@@ -367,7 +367,6 @@ vlc_module_begin ()
QT_DISABLE_VOLUME_KEYS_LONGTEXT /* longtext */)
#endif
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
add_bool( "qt-titlebar",
#ifdef _WIN32
false /* use CSD by default on windows */,
......@@ -375,7 +374,6 @@ vlc_module_begin ()
true /* but not on linux */,
#endif
QT_CLIENT_SIDE_DECORATION_TEXT, QT_CLIENT_SIDE_DECORATION_LONGTEXT )
#endif
add_bool( "qt-menubar", false, QT_MENUBAR_TEXT, QT_MENUBAR_LONGTEXT )
......
......@@ -39,18 +39,12 @@
#define QT_NO_CAST_TO_ASCII
#include <QString>
static_assert (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0),
"Update your Qt version to at least 5.12.0");
#if ( QT_VERSION < QT_VERSION_CHECK(5, 15, 0) )
# define QSIGNALMAPPER_MAPPEDINT_SIGNAL QOverload<int>::of(&QSignalMapper::mapped)
# define QSIGNALMAPPER_MAPPEDSTR_SIGNAL QOverload<const QString &>::of(&QSignalMapper::mapped)
# define QSIGNALMAPPER_MAPPEDOBJ_SIGNAL QOverload<QObject *>::of(&QSignalMapper::mapped)
#else
static_assert (QT_VERSION >= QT_VERSION_CHECK(6, 2, 0),
"Update your Qt version to at least 6.2.0");
# define QSIGNALMAPPER_MAPPEDINT_SIGNAL &QSignalMapper::mappedInt
# define QSIGNALMAPPER_MAPPEDSTR_SIGNAL &QSignalMapper::mappedString
# define QSIGNALMAPPER_MAPPEDOBJ_SIGNAL &QSignalMapper::mappedObject
#endif
enum {
......@@ -167,6 +161,4 @@ static inline QString QVLCUserDir( vlc_userdir_t type )
*/
#define QT_XMAS_JOKE_DAY 354
#define QT_CLIENT_SIDE_DECORATION_AVAILABLE (QT_VERSION >= QT_VERSION_CHECK(5,15,0))
#endif
......@@ -52,11 +52,9 @@ class NavigationAttached : public QObject
VLC_QT_SIMPLE_PROPERTY(QQuickItem*, cancelItem, nullptr)
VLC_QT_SIMPLE_PROPERTY(QJSValue, cancelAction, QJSValue::UndefinedValue)
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
QML_NAMED_ELEMENT(Navigation)
QML_UNCREATABLE("Navigation is only available via attached properties.")
QML_ATTACHED(NavigationAttached)
#endif
public:
explicit NavigationAttached(QObject *parent = nullptr);
......
......@@ -641,7 +641,6 @@ void RoundImage::adjustQSGCustomGeometry(const QQuickWindow* const window)
}
else
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
// QSG(Opaque)TextureMaterial supports Qt RHI,
// so there is no obstacle using custom geometry
// if Qt RHI is in use.
......@@ -649,11 +648,5 @@ void RoundImage::adjustQSGCustomGeometry(const QQuickWindow* const window)
enableCustomGeometry();
else
disableCustomGeometry();
#else
// Qt RHI is introduced in Qt 5.14.
// QSG(Opaque)TextureMaterial does not support any graphics API other than OpenGL
// without the Qt RHI abstraction layer.
disableCustomGeometry();
#endif
}
}