author | llornkcor <llornkcor> | 2002-10-21 00:21:54 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-21 00:21:54 (UTC) |
commit | 91171c4d5508ebf151dab551d5db3c1e87465d54 (patch) (side-by-side diff) | |
tree | 63948040ab3611f28227c31d475108b56195e53b | |
parent | 8bbd3bca858939b15b8775b4811149b8d83bb6cc (diff) | |
download | opie-91171c4d5508ebf151dab551d5db3c1e87465d54.zip opie-91171c4d5508ebf151dab551d5db3c1e87465d54.tar.gz opie-91171c4d5508ebf151dab551d5db3c1e87465d54.tar.bz2 |
updated.. QTDIR/fonts/fontdir needs to be updated for opie to find ttf
-rw-r--r-- | freetype/.cvsignore | 5 | ||||
-rw-r--r-- | freetype/fontfactoryttf_qws.cpp | 4 | ||||
-rw-r--r-- | freetype/fontfactoryttf_qws.h | 4 | ||||
-rw-r--r-- | freetype/freetype.pro | 19 | ||||
-rw-r--r-- | freetype/freetypefactoryimpl.cpp | 4 | ||||
-rw-r--r-- | freetype/freetypefactoryimpl.h | 6 | ||||
-rw-r--r-- | freetype/opie-freetype.control | 8 | ||||
-rw-r--r-- | freetype/qfontdata_p.h | 6 |
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 @@ +moc_* +*.moc +Makefile* +qimpenprefbase.h +qimpenprefbase.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,10 +1,10 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** 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,10 +1,10 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** diff --git a/freetype/freetype.pro b/freetype/freetype.pro index 1196db9..5800b48 100644 --- a/freetype/freetype.pro +++ b/freetype/freetype.pro @@ -1,28 +1,11 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = fontfactoryttf_qws.h freetypefactoryimpl.h SOURCES = fontfactoryttf_qws.cpp freetypefactoryimpl.cpp qt2:HEADERS += qfontdata_p.h TARGET = freetypefactory -DESTDIR = ../plugins/fontfactories +DESTDIR = $(OPIEDIR)/plugins/fontfactories INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -#INCLUDEPATH += $(OPIEDIR)/include -#DEPENDPATH += /usr/local/include/freetype2 LIBS += -lqpe -lfreetype VERSION = 1.0.0 - -TRANSLATIONS = ../i18n/de/libfreetypefactory.ts \ - ../i18n/en/libfreetypefactory.ts \ - ../i18n/es/libfreetypefactory.ts \ - ../i18n/fr/libfreetypefactory.ts \ - ../i18n/hu/libfreetypefactory.ts \ - ../i18n/ja/libfreetypefactory.ts \ - ../i18n/ko/libfreetypefactory.ts \ - ../i18n/no/libfreetypefactory.ts \ - ../i18n/pl/libfreetypefactory.ts \ - ../i18n/pt/libfreetypefactory.ts \ - ../i18n/pt_BR/libfreetypefactory.ts \ - ../i18n/sl/libfreetypefactory.ts \ - ../i18n/zh_CN/libfreetypefactory.ts \ - ../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,10 +1,10 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** diff --git a/freetype/freetypefactoryimpl.h b/freetype/freetypefactoryimpl.h index d7c376e..4c0d5f5 100644 --- a/freetype/freetypefactoryimpl.h +++ b/freetype/freetypefactoryimpl.h @@ -1,10 +1,10 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** @@ -16,13 +16,13 @@ ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ -#include <fontfactoryinterface.h> +#include <qpe/fontfactoryinterface.h> class QFontFactoryFT; class FreeTypeFactoryImpl : public FontFactoryInterface { public: 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 @@ +Files: plugins/fontfactories/libfreetypefactory* +Priority: optional +Section: opie/plugins +Maintainer: Opie <opie@llornkcor.com> +Architecture: arm +Version: $QPE_VERSION-$SUB_VERSION +Depends: opie-base ($QPE_VERSION) +Description: 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,10 +1,10 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** @@ -30,13 +30,13 @@ // This file is not part of the Qt API. It exists for the convenience // of qmenudata.cpp, qmenubar.cpp, qmenubar.cpp, qpopupmenu.cpp, // qmotifstyle.cpp and qwindowssstyle.cpp. This header file may change // from version to version without notice, or even be removed. // // We mean it. -// +// oh, we're really scared. // #ifndef QT_H #endif // QT_H struct QFontDef { // font definition |