summaryrefslogtreecommitdiff
path: root/library
Side-by-side diff
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/Makefile.in26
-rw-r--r--library/global.cpp2
-rw-r--r--library/library.pro4
-rw-r--r--library/qpeapplication.cpp4
4 files changed, 17 insertions, 19 deletions
diff --git a/library/Makefile.in b/library/Makefile.in
index c89390f..b74b818 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -5,9 +5,9 @@
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH = -I$(QPEDIR)/include -Ibackend
+INCPATH = -I$(OPIEDIR)/include -Ibackend
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
MOC = $(SYSCONF_MOC)
UIC = $(SYSCONF_UIC)
@@ -456,9 +456,10 @@ qpeapplication.o: qpeapplication.cpp \
network.h \
fontmanager.h \
power.h \
alarmserver.h \
- applnk.h
+ applnk.h \
+ qpemenubar.h
qpestyle.o: qpestyle.cpp \
qpestyle.h \
qpeapplication.h \
@@ -532,9 +533,10 @@ fontdatabase.o: fontdatabase.cpp \
fontfactoryinterface.h \
fontdatabase.h
power.o: power.cpp \
- power.h
+ power.h \
+ custom.h
storage.o: storage.cpp
qpemessagebox.o: qpemessagebox.cpp \
@@ -609,9 +611,10 @@ ir.o: ir.cpp \
qcopenvelope_qws.h \
applnk.h
backend/vcc_yacc.o: backend/vcc_yacc.cpp \
- backend/vobject_p.h
+ backend/vobject_p.h \
+ backend/qfiledirect_p.h
backend/vobject.o: backend/vobject.cpp \
backend/vobject_p.h \
backend/qfiledirect_p.h
@@ -678,22 +681,17 @@ lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
$(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
-passwordbase_p.o: passwordbase_p.cpp \
- passwordbase_p.h
+passwordbase_p.o: passwordbase_p.cpp
-proxiesbase_p.o: proxiesbase_p.cpp \
- proxiesbase_p.h
+proxiesbase_p.o: proxiesbase_p.cpp
-categoryeditbase_p.o: categoryeditbase_p.cpp \
- categoryeditbase_p.h
+categoryeditbase_p.o: categoryeditbase_p.cpp
-findwidgetbase_p.o: findwidgetbase_p.cpp \
- findwidgetbase_p.h
+findwidgetbase_p.o: findwidgetbase_p.cpp
-lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \
- lnkpropertiesbase_p.h
+lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
moc_menubutton.o: moc_menubutton.cpp \
menubutton.h
diff --git a/library/global.cpp b/library/global.cpp
index e1bbf3e..e5fc2b3 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -133,9 +133,9 @@ static QDawg* fixed_dawg = 0;
static QDict<QDawg> *named_dawg = 0;
static QString qpeDir()
{
- QString dir = getenv("QPEDIR");
+ QString dir = getenv("OPIEDIR");
if ( dir.isEmpty() ) dir = "..";
return dir;
}
diff --git a/library/library.pro b/library/library.pro
index 06dfc8f..058d216 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -118,15 +118,15 @@ SOURCES = calendar.cpp \
qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h
qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
qprocess_unix.cpp
-INCLUDEPATH += $(QPEDIR)/include backend
+INCLUDEPATH += $(OPIEDIR)/include backend
LIBS += -ldl -lcrypt -lm
INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
TARGET = qpe
DESTDIR = $(QTDIR)/lib$(PROJMAK)
-# This is set by configure$(QPEDIR).
+# This is set by configure$(OPIEDIR).
VERSION = 1.5.0
TRANSLATIONS = ../i18n/de/libqpe.ts
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index f0a68cf..70ffec1 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -789,13 +789,13 @@ QPEApplication::~QPEApplication()
delete d;
}
/*!
- Returns <tt>$QPEDIR/</tt>.
+ Returns <tt>$OPIEDIR/</tt>.
*/
QString QPEApplication::qpeDir()
{
- const char *base = getenv( "QPEDIR" );
+ const char *base = getenv( "OPIEDIR" );
if ( base )
return QString( base ) + "/";
return QString( "../" );