| author | mickeyl <mickeyl> | 2004-03-01 18:42:17 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-03-01 18:42:17 (UTC) |
| commit | 707d84768f4a3b4ada7435ba4c7451feaa11666c (patch) (side-by-side diff) | |
| tree | a129ea982cd7c6efdb068157bc0debf33c005bcb /core/opie-login | |
| parent | 7fd20d139e2d9bc37ce22bbdb07f4ebc54903f91 (diff) | |
| download | opie-707d84768f4a3b4ada7435ba4c7451feaa11666c.zip opie-707d84768f4a3b4ada7435ba4c7451feaa11666c.tar.gz opie-707d84768f4a3b4ada7435ba4c7451feaa11666c.tar.bz2 | |
revert last commit and
libopie1-->libopie2
| -rw-r--r-- | core/opie-login/main.cpp | 34 | ||||
| -rw-r--r-- | core/opie-login/opie-login.pro | 4 |
2 files changed, 19 insertions, 19 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index bf98735..7d5792e 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp @@ -25,8 +25,24 @@ */ -#define _GNU_SOURCE +#include "loginapplication.h" +#include "loginwindowimpl.h" +#include "calibrate.h" + +/* OPIE */ +#include <opie2/odevice.h> +#include <qpe/qpestyle.h> +#include <qpe/power.h> +#include <qpe/config.h> +/* QT */ +#include <qwindowsystem_qws.h> +#include <qmessagebox.h> +#include <qlabel.h> +#include <qtimer.h> +#include <qfile.h> + +/* STD */ #include <sys/types.h> #include <time.h> #include <sys/time.h> @@ -40,22 +56,6 @@ #include <getopt.h> #include <string.h> -#include <qpe/qpestyle.h> -#include <qpe/power.h> -#include <qpe/config.h> - -#include <opie/odevice.h> - -#include <qwindowsystem_qws.h> -#include <qmessagebox.h> -#include <qlabel.h> -#include <qtimer.h> -#include <qfile.h> - -#include "loginapplication.h" -#include "loginwindowimpl.h" -#include "calibrate.h" - using namespace Opie; int login_main ( int argc, char **argv, pid_t ppid ); diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro index 0fdd8e1..30ed859 100644 --- a/core/opie-login/opie-login.pro +++ b/core/opie-login/opie-login.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG = qt warn_on debug +CONFIG = qt warn_on debug usepam HEADERS = loginwindowimpl.h \ loginapplication.h \ @@ -17,7 +17,7 @@ INTERFACES = loginwindow.ui INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 usepam:LIBS += -lpam usepam:DEFINES += USEPAM |