Diffstat (limited to 'noncore/net/wellenreiter/gui') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 59c2a61..ba1119e 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -71,13 +71,13 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
71 | } | 71 | } |
72 | } | 72 | } |
73 | 73 | ||
74 | #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here | 74 | #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here |
75 | QPushButton* okButton = new QPushButton( "ok", this ); | 75 | QPushButton* okButton = new QPushButton( "ok", this ); |
76 | okButton->show(); | 76 | okButton->show(); |
77 | Layout5_2->addWidget( okButton ); //FIXME: rename this in configbase.ui | 77 | Layout5_2->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui |
78 | connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); | 78 | connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); |
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | WellenreiterConfigWindow::_instance = this; | 81 | WellenreiterConfigWindow::_instance = this; |
82 | }; | 82 | }; |
83 | 83 | ||
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 5a8972c..5970b01 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -32,11 +32,12 @@ TARGET = wellenreiter | |||
32 | message( qws ) | 32 | message( qws ) |
33 | include ( $(OPIEDIR)/include.pro ) | 33 | include ( $(OPIEDIR)/include.pro ) |
34 | LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 | 34 | LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 |
35 | } | 35 | } |
36 | 36 | ||
37 | contains( platform, x11 ) { | 37 | contains( platform, x11 ) { |
38 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lwellenreiter | 38 | LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter |
39 | SOURCES += resource.cpp | 39 | SOURCES += resource.cpp |
40 | HEADERS += resource.h | 40 | HEADERS += resource.h |
41 | DESTDIR = $(OPIEDIR)/output/bin | ||
41 | } | 42 | } |
42 | 43 | ||