summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/confedit/confedit.pro12
-rw-r--r--noncore/apps/confedit/listviewitemconf.cpp3
-rw-r--r--noncore/apps/confedit/main.cpp5
-rw-r--r--noncore/apps/confedit/mainwindow.cpp13
4 files changed, 23 insertions, 10 deletions
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index f6227f7..d2629de 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -5,10 +5,10 @@ CONFIG = qt warn_on debug
HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/ioclude
-LIBS += -lqpe
INTERFACES =
+LIBS += -lopiecore2 -lopieui2
TARGET = confedit
TRANSLATIONS = ../../../i18n/de/confedit.ts \
../../../i18n/nl/confedit.ts \
@@ -28,6 +28,16 @@ TRANSLATIONS = ../../../i18n/de/confedit.ts \
../../../i18n/zh_CN/confedit.ts \
../../../i18n/zh_TW/confedit.ts
+!contains( platform, x11 ) {
include ( $(OPIEDIR)/include.pro )
+ LIBS += -lqpe
+}
+
+contains( platform, x11 ) {
+ LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
+}
+
+
+
diff --git a/noncore/apps/confedit/listviewitemconf.cpp b/noncore/apps/confedit/listviewitemconf.cpp
index 91edca2..61bd7ea 100644
--- a/noncore/apps/confedit/listviewitemconf.cpp
+++ b/noncore/apps/confedit/listviewitemconf.cpp
@@ -48,4 +48,7 @@ void ListViewItemConf::unchanged()
bool ListViewItemConf::revertable()
{
return _changed;
} \ No newline at end of file
+
+
+
diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp
index 6c18adb..7e7f064 100644
--- a/noncore/apps/confedit/main.cpp
+++ b/noncore/apps/confedit/main.cpp
@@ -1,13 +1,12 @@
#include "mainwindow.h"
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplication.h>
int main( int argc, char ** argv )
{
-
- QPEApplication a( argc, argv );
+ OApplication a( argc, argv, "confedit" );
MainWindow mw;
mw.showMaximized();
a.showMainDocumentWidget( &mw );
return a.exec();
diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp
index 8e36980..58538af 100644
--- a/noncore/apps/confedit/mainwindow.cpp
+++ b/noncore/apps/confedit/mainwindow.cpp
@@ -11,14 +11,14 @@
#include "mainwindow.h"
-#include <qpe/qpemenubar.h>
-#include <qpe/qpemessagebox.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
-#include <qpe/qpetoolbar.h>
-#include <qpe/qpeapplication.h>
+#include <opie2/omenubar.h>
+#include <opie2/omessagebox.h>
+#include <opie2/oresource.h>
+#include <opie2/oconfig.h>
+#include <opie2/otoolbar.h>
+#include <opie2/oapplication.h>
#include <qaction.h>
#include <qmessagebox.h>
#include <qpopupmenu.h>
#include <qtoolbutton.h>
@@ -27,8 +27,9 @@
#include <qfile.h>
#include <qpushbutton.h>
#include <qlayout.h>
#include <qlineedit.h>
+#include <qcursor.h>
#include "listviewconfdir.h"
#include "listviewitemconf.h"
#include "listviewitemconfigentry.h"