summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-10-21 00:21:54 (UTC)
committer llornkcor <llornkcor>2002-10-21 00:21:54 (UTC)
commit91171c4d5508ebf151dab551d5db3c1e87465d54 (patch) (unidiff)
tree63948040ab3611f28227c31d475108b56195e53b
parent8bbd3bca858939b15b8775b4811149b8d83bb6cc (diff)
downloadopie-91171c4d5508ebf151dab551d5db3c1e87465d54.zip
opie-91171c4d5508ebf151dab551d5db3c1e87465d54.tar.gz
opie-91171c4d5508ebf151dab551d5db3c1e87465d54.tar.bz2
updated.. QTDIR/fonts/fontdir needs to be updated for opie to find ttf
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--freetype/.cvsignore5
-rw-r--r--freetype/fontfactoryttf_qws.cpp4
-rw-r--r--freetype/fontfactoryttf_qws.h4
-rw-r--r--freetype/freetype.pro19
-rw-r--r--freetype/freetypefactoryimpl.cpp4
-rw-r--r--freetype/freetypefactoryimpl.h6
-rw-r--r--freetype/opie-freetype.control8
-rw-r--r--freetype/qfontdata_p.h6
8 files changed, 26 insertions, 30 deletions
diff --git a/freetype/.cvsignore b/freetype/.cvsignore
new file mode 100644
index 0000000..fccc477
--- a/dev/null
+++ b/freetype/.cvsignore
@@ -0,0 +1,5 @@
1moc_*
2*.moc
3Makefile*
4qimpenprefbase.h
5qimpenprefbase.cpp
diff --git a/freetype/fontfactoryttf_qws.cpp b/freetype/fontfactoryttf_qws.cpp
index 66fd96a..5aa53fb 100644
--- a/freetype/fontfactoryttf_qws.cpp
+++ b/freetype/fontfactoryttf_qws.cpp
@@ -1,7 +1,7 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
diff --git a/freetype/fontfactoryttf_qws.h b/freetype/fontfactoryttf_qws.h
index 82b7e49..4ba8ce5 100644
--- a/freetype/fontfactoryttf_qws.h
+++ b/freetype/fontfactoryttf_qws.h
@@ -1,7 +1,7 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index 1196db9..5800b48 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -4,25 +4,8 @@ HEADERS = fontfactoryttf_qws.h freetypefactoryimpl.h
4 SOURCES =fontfactoryttf_qws.cpp freetypefactoryimpl.cpp 4 SOURCES =fontfactoryttf_qws.cpp freetypefactoryimpl.cpp
5 qt2:HEADERS+= qfontdata_p.h 5 qt2:HEADERS+= qfontdata_p.h
6 TARGET = freetypefactory 6 TARGET = freetypefactory
7 DESTDIR = ../plugins/fontfactories 7 DESTDIR = $(OPIEDIR)/plugins/fontfactories
8INCLUDEPATH += $(OPIEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10#INCLUDEPATH += $(OPIEDIR)/include
11 #DEPENDPATH+= /usr/local/include/freetype2
12LIBS += -lqpe -lfreetype 10LIBS += -lqpe -lfreetype
13 VERSION = 1.0.0 11 VERSION = 1.0.0
14
15TRANSLATIONS = ../i18n/de/libfreetypefactory.ts \
16 ../i18n/en/libfreetypefactory.ts \
17 ../i18n/es/libfreetypefactory.ts \
18 ../i18n/fr/libfreetypefactory.ts \
19 ../i18n/hu/libfreetypefactory.ts \
20 ../i18n/ja/libfreetypefactory.ts \
21 ../i18n/ko/libfreetypefactory.ts \
22 ../i18n/no/libfreetypefactory.ts \
23 ../i18n/pl/libfreetypefactory.ts \
24 ../i18n/pt/libfreetypefactory.ts \
25 ../i18n/pt_BR/libfreetypefactory.ts \
26 ../i18n/sl/libfreetypefactory.ts \
27 ../i18n/zh_CN/libfreetypefactory.ts \
28 ../i18n/zh_TW/libfreetypefactory.ts
diff --git a/freetype/freetypefactoryimpl.cpp b/freetype/freetypefactoryimpl.cpp
index 8c1afab..71460b2 100644
--- a/freetype/freetypefactoryimpl.cpp
+++ b/freetype/freetypefactoryimpl.cpp
@@ -1,7 +1,7 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
diff --git a/freetype/freetypefactoryimpl.h b/freetype/freetypefactoryimpl.h
index d7c376e..4c0d5f5 100644
--- a/freetype/freetypefactoryimpl.h
+++ b/freetype/freetypefactoryimpl.h
@@ -1,7 +1,7 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
@@ -19,7 +19,7 @@
19**********************************************************************/ 19**********************************************************************/
20 20
21 21
22#include <fontfactoryinterface.h> 22#include <qpe/fontfactoryinterface.h>
23 23
24class QFontFactoryFT; 24class QFontFactoryFT;
25 25
diff --git a/freetype/opie-freetype.control b/freetype/opie-freetype.control
new file mode 100644
index 0000000..f1ce408
--- a/dev/null
+++ b/freetype/opie-freetype.control
@@ -0,0 +1,8 @@
1Files: plugins/fontfactories/libfreetypefactory*
2Priority: optional
3Section: opie/plugins
4Maintainer: Opie <opie@llornkcor.com>
5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION
7Depends: opie-base ($QPE_VERSION)
8Description: Freetype fontfactory plugin
diff --git a/freetype/qfontdata_p.h b/freetype/qfontdata_p.h
index fc22c72..9da1d06 100644
--- a/freetype/qfontdata_p.h
+++ b/freetype/qfontdata_p.h
@@ -1,7 +1,7 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
@@ -33,7 +33,7 @@
33// from version to version without notice, or even be removed. 33// from version to version without notice, or even be removed.
34// 34//
35// We mean it. 35// We mean it.
36// 36// oh, we're really scared.
37// 37//
38 38
39#ifndef QT_H 39#ifndef QT_H