Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
/psiPublic

Commit889432c

Browse files
committed
Allow enchant2 for qmake build
1 parent9fa29f9 commit889432c

File tree

3 files changed

+61
-59
lines changed

3 files changed

+61
-59
lines changed

‎configure

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,50 +1824,51 @@ name: enchant
18241824
*/
18251825
18261826
#define QC_ENCHANT
1827-
bool qc_enchant_have = false;
1827+
boolqc_enchant_have = false;
18281828
QStringList qc_enchant_defs;
18291829
QStringList qc_enchant_incs;
18301830
QStringList qc_enchant_libs;
18311831
18321832
//----------------------------------------------------------------------------
18331833
// qc_enchant
18341834
//----------------------------------------------------------------------------
1835-
class qc_enchant : public ConfObj
1836-
{
1835+
class qc_enchant : public ConfObj {
18371836
public:
1838-
qc_enchant(Conf *c) : ConfObj(c) {}
1839-
QString name() const { return "enchant"; }
1840-
QString shortname() const { return "enchant"; }
1837+
qc_enchant(Conf *c) : ConfObj(c) {}
1838+
QString name() const { return "enchant"; }
1839+
QString shortname() const { return "enchant"; }
18411840
1842-
// no output
1843-
QString checkString() const { return QString(); }
1841+
// no output
1842+
QString checkString() const { return QString(); }
18441843
1845-
bool exec()
1846-
{
1847-
// on mac, always use built-in spell check
1844+
bool exec()
1845+
{
1846+
// on mac, always use built-in spell check
18481847
#ifdef Q_OS_MAC
1849-
return false;
1848+
return false;
18501849
#endif
18511850
1852-
qc_enchant_have = false;
1853-
qc_enchant_defs.clear();
1854-
qc_enchant_incs.clear();
1855-
qc_enchant_libs.clear();
1851+
qc_enchant_have = false;
1852+
qc_enchant_defs.clear();
1853+
qc_enchant_incs.clear();
1854+
qc_enchant_libs.clear();
18561855
1857-
QStringList incs;
1858-
QString version, libs, other;
1859-
if(!conf->findPkgConfig("enchant", VersionMin, "1.3.0", &version, &incs, &libs, &other))
1860-
return false;
1861-
if(conf->findPkgConfig("enchant", VersionMin, "2.0.0", &version, &incs, &libs, &other))
1862-
qc_enchant_defs += "HAVE_ENCHANT2";
1856+
QStringList incs;
1857+
QString version, libs, other;
1858+
if (!conf->findPkgConfig("enchant", VersionMin, "1.3.0", &version, &incs, &libs, &other))
1859+
if (conf->findPkgConfig("enchant-2", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
1860+
qc_enchant_defs += "HAVE_ENCHANT2";
1861+
} else {
1862+
return false;
1863+
}
18631864
1864-
qc_enchant_defs += "HAVE_ENCHANT";
1865-
qc_enchant_incs += incs;
1866-
qc_enchant_libs += libs;
1867-
qc_enchant_have = true;
1865+
qc_enchant_defs += "HAVE_ENCHANT";
1866+
qc_enchant_incs += incs;
1867+
qc_enchant_libs += libs;
1868+
qc_enchant_have = true;
18681869
1869-
return true;
1870-
}
1870+
return true;
1871+
}
18711872
};
18721873
#line 1 "hunspell.qcm"
18731874
/*

‎configure.exe

141 Bytes
Binary file not shown.

‎qcm/enchant.qcm

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,49 @@ name: enchant
55
*/
66

77
#define QC_ENCHANT
8-
bool qc_enchant_have = false;
8+
boolqc_enchant_have = false;
99
QStringList qc_enchant_defs;
1010
QStringList qc_enchant_incs;
1111
QStringList qc_enchant_libs;
1212

1313
//----------------------------------------------------------------------------
1414
// qc_enchant
1515
//----------------------------------------------------------------------------
16-
class qc_enchant : public ConfObj
17-
{
16+
class qc_enchant : public ConfObj {
1817
public:
19-
qc_enchant(Conf *c) : ConfObj(c) {}
20-
QString name() const { return "enchant"; }
21-
QString shortname() const { return "enchant"; }
18+
qc_enchant(Conf *c) : ConfObj(c) {}
19+
QString name() const { return "enchant"; }
20+
QString shortname() const { return "enchant"; }
2221

23-
// no output
24-
QString checkString() const { return QString(); }
22+
// no output
23+
QString checkString() const { return QString(); }
2524

26-
bool exec()
27-
{
28-
// on mac, always use built-in spell check
25+
bool exec()
26+
{
27+
// on mac, always use built-in spell check
2928
#ifdef Q_OS_MAC
30-
return false;
29+
return false;
3130
#endif
3231

33-
qc_enchant_have = false;
34-
qc_enchant_defs.clear();
35-
qc_enchant_incs.clear();
36-
qc_enchant_libs.clear();
37-
38-
QStringList incs;
39-
QString version, libs, other;
40-
if(!conf->findPkgConfig("enchant", VersionMin, "1.3.0", &version, &incs, &libs, &other))
41-
return false;
42-
if(conf->findPkgConfig("enchant", VersionMin, "2.0.0", &version, &incs, &libs, &other))
43-
qc_enchant_defs += "HAVE_ENCHANT2";
44-
45-
qc_enchant_defs += "HAVE_ENCHANT";
46-
qc_enchant_incs += incs;
47-
qc_enchant_libs += libs;
48-
qc_enchant_have = true;
49-
50-
return true;
51-
}
32+
qc_enchant_have = false;
33+
qc_enchant_defs.clear();
34+
qc_enchant_incs.clear();
35+
qc_enchant_libs.clear();
36+
37+
QStringList incs;
38+
QString version, libs, other;
39+
if (!conf->findPkgConfig("enchant", VersionMin, "1.3.0", &version, &incs, &libs, &other))
40+
if (conf->findPkgConfig("enchant-2", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
41+
qc_enchant_defs += "HAVE_ENCHANT2";
42+
} else {
43+
return false;
44+
}
45+
46+
qc_enchant_defs += "HAVE_ENCHANT";
47+
qc_enchant_incs += incs;
48+
qc_enchant_libs += libs;
49+
qc_enchant_have = true;
50+
51+
return true;
52+
}
5253
};

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp