summaryrefslogtreecommitdiff
authorzecke <zecke>2005-03-25 14:26:17 (UTC)
committer zecke <zecke>2005-03-25 14:26:17 (UTC)
commit253b32c290f3b1c4546aa7021a3e5235b9ab3acd (patch) (side-by-side diff)
tree5d5bb047033f24d7e8fd3c58ade28d31eb7bfe6e
parent9d976cfe31fe9db8e602066fd1d8cdee095db115 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeglobal.h2
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
@@ -12,48 +12,50 @@
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This library is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef QPE_GLOBAL_DEFINES_H
#define QPE_GLOBAL_DEFINES_H
+#include <qglobal.h>
+
/**
* Defines for used compiler attributes
*
*/
/*
* commons
*/
#define QPE_DEPRECATED
#if defined(Q_OS_MACX)
#define QPE_WEAK_SYMBOL __attribute__((weak_import))
#define QPE_SYMBOL_USED
#define QPE_SYMBOL_UNUSED
#define QPE_EXPORT_SYMBOL
#elif defined(_OS_UNIX_)
#define QPE_WEAK_SYMBOL __attribute__((weak))
#define QPE_SYMBOL_USED __attribute__((used))
#define QPE_SYMBOL_UNUSED __attribute__((unused))
#define QPE_EXPORT_SYMBOL