-rw-r--r-- | library/Makefile.in | 26 | ||||
-rw-r--r-- | library/global.cpp | 2 | ||||
-rw-r--r-- | library/library.pro | 4 | ||||
-rw-r--r-- | library/qpeapplication.cpp | 4 |
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 | |||
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) | |||
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) | 8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) |
9 | INCPATH =-I$(QPEDIR)/include -Ibackend | 9 | INCPATH =-I$(OPIEDIR)/include -Ibackend |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) | 11 | LIBS =$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) |
@@ -458,5 +458,6 @@ qpeapplication.o: qpeapplication.cpp \ | |||
458 | power.h \ | 458 | power.h \ |
459 | alarmserver.h \ | 459 | alarmserver.h \ |
460 | applnk.h | 460 | applnk.h \ |
461 | qpemenubar.h | ||
461 | 462 | ||
462 | qpestyle.o: qpestyle.cpp \ | 463 | qpestyle.o: qpestyle.cpp \ |
@@ -534,5 +535,6 @@ fontdatabase.o: fontdatabase.cpp \ | |||
534 | 535 | ||
535 | power.o: power.cpp \ | 536 | power.o: power.cpp \ |
536 | power.h | 537 | power.h \ |
538 | custom.h | ||
537 | 539 | ||
538 | storage.o: storage.cpp | 540 | storage.o: storage.cpp |
@@ -611,5 +613,6 @@ ir.o: ir.cpp \ | |||
611 | 613 | ||
612 | backend/vcc_yacc.o: backend/vcc_yacc.cpp \ | 614 | backend/vcc_yacc.o: backend/vcc_yacc.cpp \ |
613 | backend/vobject_p.h | 615 | backend/vobject_p.h \ |
616 | backend/qfiledirect_p.h | ||
614 | 617 | ||
615 | backend/vobject.o: backend/vobject.cpp \ | 618 | backend/vobject.o: backend/vobject.cpp \ |
@@ -680,18 +683,13 @@ lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui | |||
680 | $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp | 683 | $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp |
681 | 684 | ||
682 | passwordbase_p.o: passwordbase_p.cpp \ | 685 | passwordbase_p.o: passwordbase_p.cpp |
683 | passwordbase_p.h | ||
684 | 686 | ||
685 | proxiesbase_p.o: proxiesbase_p.cpp \ | 687 | proxiesbase_p.o: proxiesbase_p.cpp |
686 | proxiesbase_p.h | ||
687 | 688 | ||
688 | categoryeditbase_p.o: categoryeditbase_p.cpp \ | 689 | categoryeditbase_p.o: categoryeditbase_p.cpp |
689 | categoryeditbase_p.h | ||
690 | 690 | ||
691 | findwidgetbase_p.o: findwidgetbase_p.cpp \ | 691 | findwidgetbase_p.o: findwidgetbase_p.cpp |
692 | findwidgetbase_p.h | ||
693 | 692 | ||
694 | lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \ | 693 | lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp |
695 | lnkpropertiesbase_p.h | ||
696 | 694 | ||
697 | moc_menubutton.o: moc_menubutton.cpp \ | 695 | moc_menubutton.o: moc_menubutton.cpp \ |
diff --git a/library/global.cpp b/library/global.cpp index e1bbf3e..e5fc2b3 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -135,5 +135,5 @@ static QDict<QDawg> *named_dawg = 0; | |||
135 | static QString qpeDir() | 135 | static QString qpeDir() |
136 | { | 136 | { |
137 | QString dir = getenv("QPEDIR"); | 137 | QString dir = getenv("OPIEDIR"); |
138 | if ( dir.isEmpty() ) dir = ".."; | 138 | if ( dir.isEmpty() ) dir = ".."; |
139 | return dir; | 139 | return dir; |
diff --git a/library/library.pro b/library/library.pro index 06dfc8f..058d216 100644 --- a/library/library.pro +++ b/library/library.pro | |||
@@ -120,5 +120,5 @@ qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ | |||
120 | qprocess_unix.cpp | 120 | qprocess_unix.cpp |
121 | 121 | ||
122 | INCLUDEPATH += $(QPEDIR)/include backend | 122 | INCLUDEPATH += $(OPIEDIR)/include backend |
123 | LIBS += -ldl -lcrypt -lm | 123 | LIBS += -ldl -lcrypt -lm |
124 | 124 | ||
@@ -127,5 +127,5 @@ INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidget | |||
127 | TARGET = qpe | 127 | TARGET = qpe |
128 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 128 | DESTDIR = $(QTDIR)/lib$(PROJMAK) |
129 | # This is set by configure$(QPEDIR). | 129 | # This is set by configure$(OPIEDIR). |
130 | VERSION = 1.5.0 | 130 | VERSION = 1.5.0 |
131 | 131 | ||
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index f0a68cf..70ffec1 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -791,9 +791,9 @@ QPEApplication::~QPEApplication() | |||
791 | 791 | ||
792 | /*! | 792 | /*! |
793 | Returns <tt>$QPEDIR/</tt>. | 793 | Returns <tt>$OPIEDIR/</tt>. |
794 | */ | 794 | */ |
795 | QString QPEApplication::qpeDir() | 795 | QString QPEApplication::qpeDir() |
796 | { | 796 | { |
797 | const char *base = getenv( "QPEDIR" ); | 797 | const char *base = getenv( "OPIEDIR" ); |
798 | if ( base ) | 798 | if ( base ) |
799 | return QString( base ) + "/"; | 799 | return QString( base ) + "/"; |