Charlie Jiang pushed to branch gsoc-2022-chariri-2 at FreeType / FreeType Demo Programs
Commits:
-
8d73df1f
by Charlie Jiang at 2022-07-27T15:48:34+08:00
1 changed file:
Changes:
... | ... | @@ -43,7 +43,11 @@ TripletSelector::repopulateFonts() |
43 | 43 | auto& info = ffm[i];
|
44 | 44 | auto name = info.filePath();
|
45 | 45 | auto displayName = info.fileName();
|
46 | +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
|
|
46 | 47 | if (info.isSymbolicLink())
|
48 | +#else
|
|
49 | + if (info.isSymLink())
|
|
50 | +#endif
|
|
47 | 51 | displayName += " [symlink]";
|
48 | 52 | |
49 | 53 | fontComboBox_->addItem(displayName, name);
|
... | ... | @@ -321,9 +325,11 @@ TripletSelector::createLayout() |
321 | 325 | faceComboBox_ = new QComboBox(this);
|
322 | 326 | niComboBox_ = new QComboBox(this);
|
323 | 327 | |
328 | +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
|
|
324 | 329 | fontComboBox_->setPlaceholderText(tr("No font open"));
|
325 | 330 | faceComboBox_->setPlaceholderText(tr("No face available"));
|
326 | 331 | niComboBox_->setPlaceholderText(tr("No named instance available"));
|
332 | +#endif
|
|
327 | 333 |
|
328 | 334 | closeFontButton_ = new QToolButton(this);
|
329 | 335 | fontUpButton_ = new QToolButton(this);
|