Compare commits
3 Commits
52527b8b55
...
njhanley/a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bb4c7ddee6 | ||
| 4bc440e906 | |||
|
|
27b248d851 |
16
app/app.pro
16
app/app.pro
@@ -19,26 +19,20 @@ RESOURCES += qml/resources.qrc
|
|||||||
## INSTALLS
|
## INSTALLS
|
||||||
#########################################
|
#########################################
|
||||||
|
|
||||||
PREFIX = $$(PREFIX) # Pass the make install PREFIX via environment variable. E.g. "PREFIX=/path/to/my/dir qmake".
|
target.path += /usr/bin/
|
||||||
isEmpty(PREFIX) {
|
|
||||||
message(No prefix given. Using /usr.)
|
|
||||||
PREFIX=/usr
|
|
||||||
}
|
|
||||||
|
|
||||||
target.path = $$PREFIX/bin
|
|
||||||
|
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
|
|
||||||
# Install icons
|
# Install icons
|
||||||
unix {
|
unix {
|
||||||
icon32.files = icons/32x32/cool-retro-term.png
|
icon32.files = icons/32x32/cool-retro-term.png
|
||||||
icon32.path = $$PREFIX/share/icons/hicolor/32x32/apps
|
icon32.path = /usr/share/icons/hicolor/32x32/apps
|
||||||
icon64.files = icons/64x64/cool-retro-term.png
|
icon64.files = icons/64x64/cool-retro-term.png
|
||||||
icon64.path = $$PREFIX/share/icons/hicolor/64x64/apps
|
icon64.path = /usr/share/icons/hicolor/64x64/apps
|
||||||
icon128.files = icons/128x128/cool-retro-term.png
|
icon128.files = icons/128x128/cool-retro-term.png
|
||||||
icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps
|
icon128.path = /usr/share/icons/hicolor/128x128/apps
|
||||||
icon256.files = icons/256x256/cool-retro-term.png
|
icon256.files = icons/256x256/cool-retro-term.png
|
||||||
icon256.path = $$PREFIX/share/icons/hicolor/256x256/apps
|
icon256.path = /usr/share/icons/hicolor/256x256/apps
|
||||||
|
|
||||||
INSTALLS += icon32 icon64 icon128 icon256
|
INSTALLS += icon32 icon64 icon128 icon256
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ int main(int argc, char *argv[])
|
|||||||
cout << " -p|--profile <prof> Run cool-retro-term with the given profile." << '\n';
|
cout << " -p|--profile <prof> Run cool-retro-term with the given profile." << '\n';
|
||||||
cout << " -h|--help Print this help." << '\n';
|
cout << " -h|--help Print this help." << '\n';
|
||||||
cout << " --verbose Print additional information such as profiles and settings." << '\n';
|
cout << " --verbose Print additional information such as profiles and settings." << '\n';
|
||||||
|
cout << " -v|--version Print the program name and version." << '\n';
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -746,7 +746,7 @@ QtObject {
|
|||||||
|
|
||||||
loadCustomProfiles()
|
loadCustomProfiles()
|
||||||
|
|
||||||
var profileArgPosition = args.indexOf("--profile")
|
var profileArgPosition = args.indexOf(/-p|--profile/)
|
||||||
if (profileArgPosition !== -1) {
|
if (profileArgPosition !== -1) {
|
||||||
var profileIndex = getProfileIndexByName(
|
var profileIndex = getProfileIndexByName(
|
||||||
args[profileArgPosition + 1])
|
args[profileArgPosition + 1])
|
||||||
|
|||||||
@@ -5,17 +5,7 @@ CONFIG += ordered
|
|||||||
SUBDIRS += qmltermwidget
|
SUBDIRS += qmltermwidget
|
||||||
SUBDIRS += app
|
SUBDIRS += app
|
||||||
|
|
||||||
#########################################
|
|
||||||
## INSTALLS
|
|
||||||
#########################################
|
|
||||||
|
|
||||||
PREFIX = $$(PREFIX) # Pass the make install PREFIX via environment variable. E.g. "PREFIX=/path/to/my/dir qmake".
|
|
||||||
isEmpty(PREFIX) {
|
|
||||||
message(No prefix given. Using /usr.)
|
|
||||||
PREFIX=/usr
|
|
||||||
}
|
|
||||||
|
|
||||||
desktop.files += cool-retro-term.desktop
|
desktop.files += cool-retro-term.desktop
|
||||||
desktop.path += $$PREFIX/share/applications
|
desktop.path += /usr/share/applications
|
||||||
|
|
||||||
INSTALLS += desktop
|
INSTALLS += desktop
|
||||||
|
|||||||
Reference in New Issue
Block a user