seeseemelk/cool-retro-term
1
0
Fork 0
Code Issues 449 Pull Requests 12 Actions Packages Projects Releases 8 Wiki Activity

Unstable #200

Merged
Swordfish90 merged 14 commits from unstable into master 2015-01-06 02:37:22 +01:00
Conversation 0 Commits 14 Files Changed 14 +11 -1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 17b70b47ce - Show all commits

10
app/main.cpp
View File

@ -24,7 +24,16 @@ QString getNamedArgument(QStringList args, QString name)
int main(int argc, char *argv[])
{
// Some environmental variable are necessary on certain platforms.
// This disables QT appmenu under Ubuntu, which is not working with QML apps.
setenv("QT_QPA_PLATFORMTHEME", "", 1);
#if defined(Q_OS_MAC)
// This allows UTF-8 characters usage in OSX.
setenv("LC_CTYPE", "UTF-8", 1);
#endif
QApplication app(argc, argv);
QQmlApplicationEngine engine;
FileIO fileIO;
@ -60,6 +69,7 @@ int main(int argc, char *argv[])
QStringList importPathList = engine.importPathList();
importPathList.prepend(QCoreApplication::applicationDirPath() + "/qmltermwidget");
importPathList.prepend(QCoreApplication::applicationDirPath() + "/../PlugIns");
importPathList.prepend(QCoreApplication::applicationDirPath() + "/../../../qmltermwidget");
engine.setImportPathList(importPathList);
engine.load(QUrl("qrc:/main.qml"));

2
qmltermwidget

@ -1 +1 @@
Subproject commit b03e96edb5d984040b1816edee8f1f51eadbaff9
Subproject commit 4b3fd2729bac10a8e292bcf027737509d10e9c74