lovecraft/qmltermwidget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build simplified: qtermwidget is versioned (libqtermwidget4 for Qt4, 5 for Qt5...). Better cmake support.

Browse Source
This commit is contained in:
Petr Vanek
2014-04-11 20:50:22 +02:00
parent 5469a4db0a
commit d6ceb5ae00
10 changed files with 349 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tools.cpp
+10 -13
View File
@@ -20,29 +20,26 @@ QString get_kb_layout_dir()
QString k(KB_LAYOUT_DIR);
QDir d(k);
// qDebug() << "default KB_LAYOUT_DIR: " << k;
qDebug() << "default KB_LAYOUT_DIR: " << k;
if (d.exists())
rval = k.append("/");
{
rval = k.append("/");
return rval;
}
// subdir in the app location
d.setPath(QCoreApplication::applicationDirPath() + "/kb-layouts/");
//qDebug() << d.path();
if (d.exists())
rval = QCoreApplication::applicationDirPath() + "/kb-layouts/";
return QCoreApplication::applicationDirPath() + "/kb-layouts/";
#ifdef Q_WS_MAC
d.setPath(QCoreApplication::applicationDirPath() + "/../Resources/kb-layouts/");
if (d.exists())
rval = QCoreApplication::applicationDirPath() + "/../Resources/kb-layouts/";
return QCoreApplication::applicationDirPath() + "/../Resources/kb-layouts/";
#endif
#ifdef QT_DEBUG
if(!rval.isEmpty()) {
qDebug() << "Using kb-layouts: " << rval;
} else {
qDebug() << "Cannot find kb-layouts in any location!";
}
#endif
return rval;
qDebug() << "Cannot find KB_LAYOUT_DIR. Default:" << k;
return QString();
#endif // BUNDLE_KEYBOARDLAYOUTS
}
@@ -85,4 +82,4 @@ QString get_color_schemes_dir()
#endif
return rval;
#endif // BUNDLE_COLORSCHEMES
}
}