Merge with develop
--HG-- branch : feature
This commit is contained in:
commit
940a1e404b
|
@ -69,7 +69,7 @@ protected:
|
||||||
QString TapePath() const;
|
QString TapePath() const;
|
||||||
QString TranslationsPath() const;
|
QString TranslationsPath() const;
|
||||||
|
|
||||||
int Run(int exit, const QString &program, const QStringList &arguments, int msecs = 30000);
|
int Run(int exit, const QString &program, const QStringList &arguments, int msecs = 120000);
|
||||||
bool CopyRecursively(const QString &srcFilePath, const QString &tgtFilePath) const;
|
bool CopyRecursively(const QString &srcFilePath, const QString &tgtFilePath) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user