[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-425-g9598699
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-425-g9598699
|
From: jscheer <js...@us...> - 2012-06-26 16:25:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9598699e959a1d9531bedbe7b8f6710112a2335d (commit)
from cf135893b8af8d14bcb8fb2f8a45823b864b0577 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9598699e959a1d9531bedbe7b8f6710112a2335d
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Jun 26 18:24:35 2012 +0200
[DEMOS] Update custom QMakeSpec in ApfDacClientServer demos and use it in build.sh.
[DEMOS] Fix includes in ApfDacClientServer demos (ApfServerMain).
-----------------------------------------------------------------------
Summary of changes:
.../QtopiaMkspec/linux-arm-g++/qplatformdefs.h | 118 ++++++++------------
.../src/Server/ApfServerMain.cpp | 2 +
software/demos/ApfDacClientServer/src/build.sh | 2 +-
3 files changed, 52 insertions(+), 70 deletions(-)
diff --git a/software/demos/ApfDacClientServer/QtopiaMkspec/linux-arm-g++/qplatformdefs.h b/software/demos/ApfDacClientServer/QtopiaMkspec/linux-arm-g++/qplatformdefs.h
index 87d4ae2..07cab1d 100644
--- a/software/demos/ApfDacClientServer/QtopiaMkspec/linux-arm-g++/qplatformdefs.h
+++ b/software/demos/ApfDacClientServer/QtopiaMkspec/linux-arm-g++/qplatformdefs.h
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt...@no...)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
#ifndef QPLATFORMDEFS_H
#define QPLATFORMDEFS_H
@@ -19,14 +60,13 @@
// We are hot - unistd.h should have turned on the specific APIs we requested
-
+#include <features.h>
#include <pthread.h>
#include <dirent.h>
#include <fcntl.h>
#include <grp.h>
#include <pwd.h>
#include <signal.h>
-#include <dlfcn.h>
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -37,78 +77,19 @@
#include <sys/stat.h>
#include <sys/wait.h>
#include <netinet/in.h>
-
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_STATBUF struct stat64
-#define QT_STATBUF4TSTAT struct stat64
-#define QT_STAT ::stat64
-#define QT_FSTAT ::fstat64
-#define QT_LSTAT ::lstat64
-#define QT_OPEN ::open64
-#define QT_TRUNCATE ::truncate64
-#define QT_FTRUNCATE ::ftruncate64
-#define QT_LSEEK ::lseek64
-#else
-#define QT_STATBUF struct stat
-#define QT_STATBUF4TSTAT struct stat
-#define QT_STAT ::stat
-#define QT_FSTAT ::fstat
-#define QT_LSTAT ::lstat
-#define QT_OPEN ::open
-#define QT_TRUNCATE ::truncate
-#define QT_FTRUNCATE ::ftruncate
-#define QT_LSEEK ::lseek
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
#endif
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_FOPEN ::fopen64
-#define QT_FSEEK ::fseeko
-#define QT_FTELL ::ftello
-#define QT_FGETPOS ::fgetpos64
-#define QT_FSETPOS ::fsetpos64
-#define QT_FPOS_T fpos64_t
-#define QT_OFF_T off_t
-#else
-#define QT_FOPEN ::fopen
-#define QT_FSEEK ::fseek
-#define QT_FTELL ::ftell
-#define QT_FGETPOS ::fgetpos
-#define QT_FSETPOS ::fsetpos
-#define QT_FPOS_T fpos_t
-#define QT_OFF_T long
-#endif
+#define QT_USE_XOPEN_LFS_EXTENSIONS
+#include "../common/posix/qplatformdefs.h"
-#define QT_STAT_REG S_IFREG
-#define QT_STAT_DIR S_IFDIR
-#define QT_STAT_MASK S_IFMT
-#define QT_STAT_LNK S_IFLNK
-#define QT_SOCKET_CONNECT ::connect
-#define QT_SOCKET_BIND ::bind
-#define QT_SOCKET_BIND ::bind
-#define QT_FILENO fileno
-#define QT_CLOSE ::close
-#define QT_READ ::read
-#define QT_WRITE ::write
-#define QT_ACCESS ::access
-#define QT_GETCWD ::getcwd
-#define QT_CHDIR ::chdir
-#define QT_MKDIR ::mkdir
-#define QT_RMDIR ::rmdir
-#define QT_OPEN_RDONLY O_RDONLY
-#define QT_OPEN_WRONLY O_WRONLY
-#define QT_OPEN_RDWR O_RDWR
-#define QT_OPEN_CREAT O_CREAT
-#define QT_OPEN_TRUNC O_TRUNC
-#define QT_OPEN_APPEND O_APPEND
-
-#define QT_SIGNAL_RETTYPE void
-#define QT_SIGNAL_ARGS int
-#define QT_SIGNAL_IGNORE SIG_IGN
+#undef QT_SOCKLEN_T
#if defined(__GLIBC__) && (__GLIBC__ >= 2)
-#define QT_SOCKLEN_T socklen_t
+#define QT_SOCKLEN_T socklen_t
#else
-#define QT_SOCKLEN_T int
+#define QT_SOCKLEN_T int
#endif
#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
@@ -116,5 +97,4 @@
#define QT_VSNPRINTF ::vsnprintf
#endif
-
#endif // QPLATFORMDEFS_H
diff --git a/software/demos/ApfDacClientServer/src/Server/ApfServerMain.cpp b/software/demos/ApfDacClientServer/src/Server/ApfServerMain.cpp
index 44cbf1e..e79f0f6 100755
--- a/software/demos/ApfDacClientServer/src/Server/ApfServerMain.cpp
+++ b/software/demos/ApfDacClientServer/src/Server/ApfServerMain.cpp
@@ -23,7 +23,9 @@
*/
+
#include <sys/types.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/software/demos/ApfDacClientServer/src/build.sh b/software/demos/ApfDacClientServer/src/build.sh
index 70ca5d3..124fc65 100755
--- a/software/demos/ApfDacClientServer/src/build.sh
+++ b/software/demos/ApfDacClientServer/src/build.sh
@@ -88,7 +88,7 @@ export OUTPUT_DIR=../../bin/apf
#export QTDIR=$ARMADEUS_ROOTFS_DIR/qt/qtopia.4.2.0/
export QTDIR=$ARMADEUS_QTE_DIR
## due to some installation problems.... I use a custom qmake spec
-export QMAKESPEC=$ARMADEUS_QTE_DIR/mkspecs/qws/linux-arm-g++
+export QMAKESPEC=../../QtopiaMkspec/linux-arm-g++
export PATH=$ARMADEUS_TOOLCHAIN_PATH:$QTDIR/bin:$INITIALPATH
buildForEnvironment "APF board" $1
hooks/post-receive
--
armadeus
|
