aboutsummaryrefslogtreecommitdiffstats
path: root/SQLiteStudio3/SQLiteStudio3.pro
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2014-12-14 08:24:32 -0500
committerLibravatarUnit 193 <unit193@ubuntu.com>2014-12-14 08:24:32 -0500
commite571839e140139a6a819077e94cf8cc01c13b29f (patch)
tree8263635257cfb5ed979a584a958103b700bf31e7 /SQLiteStudio3/SQLiteStudio3.pro
parent407eac41f46936e3f346bb5a964a682e578b4237 (diff)
parent89214766d8e3e7b8dd749a1fa18a5b9727f5010d (diff)
Merge tag 'upstream/3.0.0'
Upstream version 3.0.0 # gpg: Signature made Sun 14 Dec 2014 08:24:31 AM EST using RSA key ID EBE9BD91 # gpg: Good signature from "Unit 193 <unit193@gmail.com>" # gpg: aka "Unit 193 <unit193@ninthfloor.org>" # gpg: aka "Unit 193 <unit193@ubuntu.com>"
Diffstat (limited to 'SQLiteStudio3/SQLiteStudio3.pro')
-rw-r--r--SQLiteStudio3/SQLiteStudio3.pro14
1 files changed, 8 insertions, 6 deletions
diff --git a/SQLiteStudio3/SQLiteStudio3.pro b/SQLiteStudio3/SQLiteStudio3.pro
index 66efea7..90a7dd9 100644
--- a/SQLiteStudio3/SQLiteStudio3.pro
+++ b/SQLiteStudio3/SQLiteStudio3.pro
@@ -27,20 +27,22 @@ if(contains(DEFINES,tests)) {
SUBDIRS += tests
}
+OUTPUT_DIR_NAME = output
+
win32: {
SUBDIRS += update_app
}
linux: {
- portable.commands = sh $$PWD/create_linux_portable.sh $$PWD/../output $$QMAKE_QMAKE
- tgz.commands = sh $$PWD/create_linux_portable.sh $$PWD/../output $$QMAKE_QMAKE tgz
- dist.commands = sh $$PWD/create_linux_portable.sh $$PWD/../output $$QMAKE_QMAKE dist
+ portable.commands = sh $$PWD/create_linux_portable.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE
+ tgz.commands = sh $$PWD/create_linux_portable.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE tgz
+ dist.commands = sh $$PWD/create_linux_portable.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE dist
QMAKE_EXTRA_TARGETS += portable tgz dist
}
macx: {
- bundle.commands = sh $$PWD/create_macosx_bundle.sh $$PWD/../output $$QMAKE_QMAKE
- dmg.commands = sh $$PWD/create_macosx_bundle.sh $$PWD/../output $$QMAKE_QMAKE dmg
- dist.commands = sh $$PWD/create_macosx_bundle.sh $$PWD/../output $$QMAKE_QMAKE dist
+ bundle.commands = sh $$PWD/create_macosx_bundle.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE
+ dmg.commands = sh $$PWD/create_macosx_bundle.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE dmg
+ dist.commands = sh $$PWD/create_macosx_bundle.sh $$PWD/../$$OUTPUT_DIR_NAME $$QMAKE_QMAKE dist
QMAKE_EXTRA_TARGETS += bundle dmg dist
}