diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-04 12:23:39 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-04 12:23:39 +0200 |
| commit | db4311d5b5786277c78c8840b8e16b334500856b (patch) | |
| tree | fdd10b093d403acc72018efba4051506a832fc6c /dist/gdb | |
| parent | d2bf853ca13854cee1757583cd8789741e3b8e18 (diff) | |
| parent | ed86a7ca5860b7e48fd7de2a63f3983f37667c4b (diff) | |
| download | qt-creator-db4311d5b5786277c78c8840b8e16b334500856b.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
dist/gdb/Makefile.osx
src/libs/qmldebug/qmldebug.qbs
src/plugins/android/androidsettingswidget.cpp
Change-Id: I85627130b575f7d08f416dea52031fa72019b217
Diffstat (limited to 'dist/gdb')
| -rw-r--r-- | dist/gdb/Makefile.linux | 2 | ||||
| -rw-r--r-- | dist/gdb/Makefile.mingw | 2 | ||||
| -rw-r--r-- | dist/gdb/Makefile.osx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dist/gdb/Makefile.linux b/dist/gdb/Makefile.linux index f12d25eaf8..94bf99bca9 100644 --- a/dist/gdb/Makefile.linux +++ b/dist/gdb/Makefile.linux @@ -1,6 +1,6 @@ broot=${PWD} source=${broot}/source -targets=x86_64-unknown-linux-gnu i686-unknown-linux-gnu arm-none-linux-gnueabi arm-none-symbianelf +targets=x86_64-unknown-linux-gnu i686-unknown-linux-gnu arm-none-linux-gnueabi staging=${broot}/staging pyversion=2.7 expatversion=2.0.1 diff --git a/dist/gdb/Makefile.mingw b/dist/gdb/Makefile.mingw index 4d36fa67bd..acc8a84173 100644 --- a/dist/gdb/Makefile.mingw +++ b/dist/gdb/Makefile.mingw @@ -1,6 +1,6 @@ broot=${PWD} source=${broot}/source -targets=arm-none-symbianelf arm-none-linux-gnueabi i686-pc-mingw32 +targets=arm-none-linux-gnueabi i686-pc-mingw32 staging=${broot}/staging pyversion=2.7 pydir=${broot}/python diff --git a/dist/gdb/Makefile.osx b/dist/gdb/Makefile.osx index e73a962434..20517d01ea 100644 --- a/dist/gdb/Makefile.osx +++ b/dist/gdb/Makefile.osx @@ -1,6 +1,6 @@ broot=${PWD} source=${broot}/source -targets=x86_64-unknown-linux-gnu i686-unknown-linux-gnu arm-none-linux-gnueabi arm-none-symbianelf x86_64-apple-darwin10 +targets=x86_64-unknown-linux-gnu i686-unknown-linux-gnu arm-none-linux-gnueabi x86_64-apple-darwin10 staging=${broot}/staging pyversion=2.7 expatversion=2.0.1 |