comparison src/multichoicedialog.cpp @ 672:88fa1544b407

Merge from branch qt5. There's much more to be done before we can make another release, but clearly it's going to be done using qt5
author Chris Cannam
date Wed, 05 Dec 2018 09:44:10 +0000
parents ce29dc775650
children 0329bbd4b57c
comparison
equal deleted inserted replaced
665:88061103b878 672:88fa1544b407
219 } 219 }
220 } 220 }
221 } 221 }
222 222
223 void 223 void
224 MultiChoiceDialog::urlChanged(const QString &s) 224 MultiChoiceDialog::urlChanged(const QString &)
225 { 225 {
226 updateOkButton(); 226 updateOkButton();
227 updateFileComboFromURL(); 227 updateFileComboFromURL();
228 } 228 }
229 229
230 void 230 void
231 MultiChoiceDialog::fileChanged(const QString &s) 231 MultiChoiceDialog::fileChanged(const QString &)
232 { 232 {
233 updateOkButton(); 233 updateOkButton();
234 } 234 }
235 235
236 void 236 void