summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2009-03-06 09:34:00 +0100
committerhjk <qtc-committer@nokia.com>2009-03-06 09:34:00 +0100
commit850102307d57f9535e3b4d47d71f06479fa19cd0 (patch)
treef7e3deed741d5cd9cdd1bcaa2fc48555a2d0ad1d
parentbb8ff39ae3799407b7a9a4bb68fa1750fcf148f1 (diff)
downloadqt-creator-850102307d57f9535e3b4d47d71f06479fa19cd0.tar.gz
Fixes: add startup script for creator
Details: LD_LIBRARY_PATH setting still missing
-rw-r--r--.gitignore2
-rwxr-xr-xbin/qtcreator3
-rw-r--r--src/qworkbench.pri3
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 9487adc140..8f3ba0e854 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,7 +72,7 @@ src/xml/lib/
# Binaries
# --------
bin/*.dll
-bin/qtcreator
+bin/qtcreator.bin
bin/qtcreator.exe
doc/qtcreator.qch
tests/manual/cplusplus/cplusplus0
diff --git a/bin/qtcreator b/bin/qtcreator
new file mode 100755
index 0000000000..be657dcf8f
--- /dev/null
+++ b/bin/qtcreator
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+"`dirname \"$0\"`/qtcreator.bin" ${1+"$@"}
diff --git a/src/qworkbench.pri b/src/qworkbench.pri
index 353846c690..8116de8600 100644
--- a/src/qworkbench.pri
+++ b/src/qworkbench.pri
@@ -20,12 +20,13 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
contains(QT_CONFIG, ppc):CONFIG += ppc x86
} else {
- IDE_APP_TARGET = qtcreator
+ IDE_APP_TARGET = qtcreator.bin
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/lib/qtcreator
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins/
}
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
win32 {
+ IDE_APP_TARGET = qtcreator
IDE_LIBRARY_PATH ~= s|/+|\|
IDE_APP_PATH ~= s|/+|\|
}