mirror of
https://invent.kde.org/graphics/okular
synced 2024-11-05 18:34:53 +00:00
remove qt3 support need for gs generator
svn path=/trunk/playground/graphics/okular/; revision=588874
This commit is contained in:
parent
f67a7f00a6
commit
8328b24178
3 changed files with 22 additions and 4 deletions
|
@ -6,7 +6,6 @@ include_directories(
|
|||
${CMAKE_SOURCE_DIR}/libqgs
|
||||
)
|
||||
|
||||
add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
|
||||
add_definitions(${KDE4_ENABLE_EXCEPTIONS})
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
@ -430,8 +430,22 @@ kWarning() << "generator running : " << pixGenerator->running() << endl;
|
|||
bool GSGenerator::canGeneratePixmap( bool async )
|
||||
{
|
||||
// kWarning () << "ready Async/Sync " << (! docLock.locked()) << "/ " << (( pixGenerator ) ? !syncLock.locked() : true) << " asking for async: " << async << endl;
|
||||
if (async) return !docLock.locked();
|
||||
return !syncLock.locked();
|
||||
bool isLocked = true;
|
||||
if (async)
|
||||
{
|
||||
if (docLock.tryLock()) {
|
||||
docLock.unlock();
|
||||
isLocked = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (syncLock.tryLock()) {
|
||||
syncLock.unlock();
|
||||
isLocked = false;
|
||||
}
|
||||
}
|
||||
return !isLocked;
|
||||
}
|
||||
|
||||
const Okular::DocumentInfo * GSGenerator::generateDocumentInfo()
|
||||
|
|
|
@ -130,7 +130,12 @@ void GSInterpreterCMD::destroyInternalProcess(KProcess * stop)
|
|||
|
||||
bool GSInterpreterCMD::ready()
|
||||
{
|
||||
return !interpreterLock.locked();
|
||||
bool isLocked = true;
|
||||
if (interpreterLock.tryLock()) {
|
||||
interpreterLock.unlock();
|
||||
isLocked = false;
|
||||
}
|
||||
return !isLocked;
|
||||
}
|
||||
|
||||
bool GSInterpreterCMD::interpreterRunning ()
|
||||
|
|
Loading…
Reference in a new issue