diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2015-01-27 06:53:52 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-18 16:52:52 +0100 |
commit | dfea51574bd4fe5ce1c2e3bf3f18b8ee7c0e8eb7 (patch) | |
tree | 00b74bd92e92990619e46e7de7865634894db7e5 /recipes-qt/qt5/qt5-creator | |
parent | ce88fc4221a8f71cc8f37dec2213f797a5e366c4 (diff) | |
download | meta-qt5-dfea51574bd4fe5ce1c2e3bf3f18b8ee7c0e8eb7.tar.gz |
qt5-creator: add 3.3.0 of qt-creator
* this is the first version which dropped qt4 support
* rename recipe to avoid conflicts with meta-oe's qt-creator
* Desktop file was based on [1]
[1] http://pkgs.fedoraproject.org/cgit/qt-creator.git/tree/qtcreator.desktop
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt5-creator')
-rw-r--r-- | recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch | 94 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-creator/qtcreator.desktop.in | 10 |
2 files changed, 104 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch b/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch new file mode 100644 index 00000000..3ed8bc45 --- /dev/null +++ b/recipes-qt/qt5/qt5-creator/0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | From 748174788b318c6316e6d41ce323306120223e02 Mon Sep 17 00:00:00 2001 | ||
2 | From: Greg Nietsky <gregory@distrotech.co.za> | ||
3 | Date: Tue, 4 Mar 2014 11:33:40 +0200 | ||
4 | Subject: [PATCH 1/2] Fix: Allow qt-creator to build on arm aarch32 and aarch64 | ||
5 | |||
6 | Botan is imported hardwired for x86 this small patch allows it | ||
7 | too operate on arm other platforms could be added. | ||
8 | |||
9 | Task-number: QTCREATORBUG-8107 | ||
10 | Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a | ||
11 | --- | ||
12 | src/libs/3rdparty/botan/botan.cpp | 16 +++++++++++++++- | ||
13 | src/libs/3rdparty/botan/botan.h | 2 ++ | ||
14 | 2 files changed, 17 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp | ||
17 | index b7a9ddf..c5b9826 100644 | ||
18 | --- a/src/libs/3rdparty/botan/botan.cpp | ||
19 | +++ b/src/libs/3rdparty/botan/botan.cpp | ||
20 | @@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator | ||
21 | |||
22 | #if (BOTAN_MP_WORD_BITS != 32) | ||
23 | #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32 | ||
24 | +#elif !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) | ||
25 | +typedef Botan::u64bit dword; | ||
26 | #endif | ||
27 | |||
28 | #ifdef Q_OS_UNIX | ||
29 | @@ -1118,6 +1120,7 @@ extern "C" { | ||
30 | */ | ||
31 | inline word word_madd2(word a, word b, word* c) | ||
32 | { | ||
33 | +#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) | ||
34 | asm( | ||
35 | ASM("mull %[b]") | ||
36 | ASM("addl %[c],%[a]") | ||
37 | @@ -1127,6 +1130,11 @@ inline word word_madd2(word a, word b, word* c) | ||
38 | : "0"(a), "1"(b), [c]"g"(*c) : "cc"); | ||
39 | |||
40 | return a; | ||
41 | +#else | ||
42 | + dword z = (dword)a * b + *c; | ||
43 | + *c = (word)(z >> BOTAN_MP_WORD_BITS); | ||
44 | + return (word)z; | ||
45 | +#endif | ||
46 | } | ||
47 | |||
48 | /* | ||
49 | @@ -1134,6 +1142,7 @@ inline word word_madd2(word a, word b, word* c) | ||
50 | */ | ||
51 | inline word word_madd3(word a, word b, word c, word* d) | ||
52 | { | ||
53 | +#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) | ||
54 | asm( | ||
55 | ASM("mull %[b]") | ||
56 | |||
57 | @@ -1147,6 +1156,11 @@ inline word word_madd3(word a, word b, word c, word* d) | ||
58 | : "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc"); | ||
59 | |||
60 | return a; | ||
61 | +#else | ||
62 | + dword z = (dword)a * b + c + *d; | ||
63 | + *d = (word)(z >> BOTAN_MP_WORD_BITS); | ||
64 | + return (word)z; | ||
65 | +#endif | ||
66 | } | ||
67 | |||
68 | } | ||
69 | @@ -2315,7 +2329,7 @@ namespace Botan { | ||
70 | |||
71 | extern "C" { | ||
72 | |||
73 | -#ifdef Q_OS_UNIX | ||
74 | +#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) | ||
75 | /* | ||
76 | * Helper Macros for x86 Assembly | ||
77 | */ | ||
78 | diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h | ||
79 | index 2981d2c..1c8d828 100644 | ||
80 | --- a/src/libs/3rdparty/botan/botan.h | ||
81 | +++ b/src/libs/3rdparty/botan/botan.h | ||
82 | @@ -82,7 +82,9 @@ | ||
83 | #endif | ||
84 | |||
85 | #define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN | ||
86 | +#if !defined(__arm__) && !defined(__aarch64__) | ||
87 | #define BOTAN_TARGET_CPU_IS_X86_FAMILY | ||
88 | +#endif | ||
89 | #define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1 | ||
90 | |||
91 | #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \ | ||
92 | -- | ||
93 | 1.8.3.1 | ||
94 | |||
diff --git a/recipes-qt/qt5/qt5-creator/qtcreator.desktop.in b/recipes-qt/qt5/qt5-creator/qtcreator.desktop.in new file mode 100644 index 00000000..64f7c6ba --- /dev/null +++ b/recipes-qt/qt5/qt5-creator/qtcreator.desktop.in | |||
@@ -0,0 +1,10 @@ | |||
1 | [Desktop Entry] | ||
2 | Type=Application | ||
3 | Exec=sh -c "PATH=$PATH:@QT5_QMAKE@ qtcreator %F" | ||
4 | Name=Qt Creator | ||
5 | GenericName=C++ IDE for developing Qt applications | ||
6 | X-KDE-StartupNotify=true | ||
7 | Icon=QtProject-qtcreator | ||
8 | Terminal=false | ||
9 | Categories=Development;IDE;Qt; | ||
10 | MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource; | ||