author | zecke <zecke> | 2005-03-25 14:26:17 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-03-25 14:26:17 (UTC) |
commit | 253b32c290f3b1c4546aa7021a3e5235b9ab3acd (patch) (unidiff) | |
tree | 5d5bb047033f24d7e8fd3c58ade28d31eb7bfe6e | |
parent | 9d976cfe31fe9db8e602066fd1d8cdee095db115 (diff) | |
download | opie-253b32c290f3b1c4546aa7021a3e5235b9ab3acd.zip opie-253b32c290f3b1c4546aa7021a3e5235b9ab3acd.tar.gz opie-253b32c290f3b1c4546aa7021a3e5235b9ab3acd.tar.bz2 |
Trivial fix:
OS_UNIX et al is defined in qglobal.h so when including
qpeglobal.h before most Qt headers the defines in qpeglobal
are not valid.
For example the QCOM instantiate method could not be exported
properly due this.
At least opie-eye when built with OpenEmbedded suffered this
problem.
-rw-r--r-- | library/qpeglobal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/qpeglobal.h b/library/qpeglobal.h index f64ccfd..d353942 100644 --- a/library/qpeglobal.h +++ b/library/qpeglobal.h | |||
@@ -4,64 +4,66 @@ | |||
4 | Copyright (c) 2002,2003,2004 Stefan Eilers <eilers@handhelds.org> | 4 | Copyright (c) 2002,2003,2004 Stefan Eilers <eilers@handhelds.org> |
5 | 5 | ||
6 | =. | 6 | =. |
7 | .=l. | 7 | .=l. |
8 | .>+-= | 8 | .>+-= |
9 | _;:, .> :=|. This library is free software; you can | 9 | _;:, .> :=|. This library is free software; you can |
10 | .> <`_, > . <= redistribute it and/or modify it under | 10 | .> <`_, > . <= redistribute it and/or modify it under |
11 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 11 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
12 | .="- .-=="i, .._ License as published by the Free Software | 12 | .="- .-=="i, .._ License as published by the Free Software |
13 | - . .-<_> .<> Foundation; either version 2 of the License, | 13 | - . .-<_> .<> Foundation; either version 2 of the License, |
14 | ._= =} : or (at your option) any later version. | 14 | ._= =} : or (at your option) any later version. |
15 | .%`+i> _;_. | 15 | .%`+i> _;_. |
16 | .i_,=:_. -<s. This library is distributed in the hope that | 16 | .i_,=:_. -<s. This library is distributed in the hope that |
17 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 17 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
18 | : .. .:, . . . without even the implied warranty of | 18 | : .. .:, . . . without even the implied warranty of |
19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
21 | ..}^=.= = ; Library General Public License for more | 21 | ..}^=.= = ; Library General Public License for more |
22 | ++= -. .` .: details. | 22 | ++= -. .` .: details. |
23 | : = ...= . :.=- | 23 | : = ...= . :.=- |
24 | -. .:....=;==+<; You should have received a copy of the GNU | 24 | -. .:....=;==+<; You should have received a copy of the GNU |
25 | -_. . . )=. = Library General Public License along with | 25 | -_. . . )=. = Library General Public License along with |
26 | -- :-=` this library; see the file COPYING.LIB. | 26 | -- :-=` this library; see the file COPYING.LIB. |
27 | If not, write to the Free Software Foundation, | 27 | If not, write to the Free Software Foundation, |
28 | Inc., 59 Temple Place - Suite 330, | 28 | Inc., 59 Temple Place - Suite 330, |
29 | Boston, MA 02111-1307, USA. | 29 | Boston, MA 02111-1307, USA. |
30 | 30 | ||
31 | */ | 31 | */ |
32 | 32 | ||
33 | #ifndef QPE_GLOBAL_DEFINES_H | 33 | #ifndef QPE_GLOBAL_DEFINES_H |
34 | #define QPE_GLOBAL_DEFINES_H | 34 | #define QPE_GLOBAL_DEFINES_H |
35 | 35 | ||
36 | #include <qglobal.h> | ||
37 | |||
36 | /** | 38 | /** |
37 | * Defines for used compiler attributes | 39 | * Defines for used compiler attributes |
38 | * | 40 | * |
39 | */ | 41 | */ |
40 | 42 | ||
41 | /* | 43 | /* |
42 | * commons | 44 | * commons |
43 | */ | 45 | */ |
44 | #define QPE_DEPRECATED | 46 | #define QPE_DEPRECATED |
45 | 47 | ||
46 | 48 | ||
47 | #if defined(Q_OS_MACX) | 49 | #if defined(Q_OS_MACX) |
48 | #define QPE_WEAK_SYMBOL __attribute__((weak_import)) | 50 | #define QPE_WEAK_SYMBOL __attribute__((weak_import)) |
49 | #define QPE_SYMBOL_USED | 51 | #define QPE_SYMBOL_USED |
50 | #define QPE_SYMBOL_UNUSED | 52 | #define QPE_SYMBOL_UNUSED |
51 | #define QPE_EXPORT_SYMBOL | 53 | #define QPE_EXPORT_SYMBOL |
52 | 54 | ||
53 | #elif defined(_OS_UNIX_) | 55 | #elif defined(_OS_UNIX_) |
54 | #define QPE_WEAK_SYMBOL __attribute__((weak)) | 56 | #define QPE_WEAK_SYMBOL __attribute__((weak)) |
55 | #define QPE_SYMBOL_USED __attribute__((used)) | 57 | #define QPE_SYMBOL_USED __attribute__((used)) |
56 | #define QPE_SYMBOL_UNUSED __attribute__((unused)) | 58 | #define QPE_SYMBOL_UNUSED __attribute__((unused)) |
57 | #define QPE_EXPORT_SYMBOL | 59 | #define QPE_EXPORT_SYMBOL |
58 | 60 | ||
59 | 61 | ||
60 | /* | 62 | /* |
61 | * mark method as deprecated | 63 | * mark method as deprecated |
62 | */ | 64 | */ |
63 | #if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2) | 65 | #if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2) |
64 | /* gcc >= 3.2 */ | 66 | /* gcc >= 3.2 */ |
65 | #undef QPE_DEPRECATED | 67 | #undef QPE_DEPRECATED |
66 | #define QPE_DEPRECATED __attribute__((deprecated)) | 68 | #define QPE_DEPRECATED __attribute__((deprecated)) |
67 | #endif | 69 | #endif |