From d9bab2c0bab3d8a2b4afdb7d3dfd24def8899524 Mon Sep 17 00:00:00 2001 From: chris Date: Sun, 22 Sep 2002 22:17:22 +0000 Subject: [PATCH] *** empty log message *** --- MainWindow.cpp | 2 +- Makefile.in | 7 ++----- lib/Makefile.in | 3 +-- lib/db_base.cpp | 1 - 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/MainWindow.cpp b/MainWindow.cpp index 6a914ebe..10d59909 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -64,7 +64,7 @@ MainWindow::MainWindow(QWidget *parent, const char *name ) connect( (QObject *)quitApp, SIGNAL(clicked()), (QObject *)qApp, SLOT(quit()) ); QString cpr = "(c) 2002 by Christian@Hohnstaedt.de - Version: "; copyright->setText(cpr + VER); -#ifndef HAVE_CONGIG_H +#ifndef HAVE_CONFIG_H baseDir = "C:"; #else baseDir = QDir::homeDirPath(); diff --git a/Makefile.in b/Makefile.in index 5395c1dd..72888a52 100644 --- a/Makefile.in +++ b/Makefile.in @@ -30,10 +30,7 @@ MOC_CPP=$(patsubst %,moc_%.cpp,$(MOCNAMES)) UI_CPP=$(patsubst %, %.cpp, $(UINAMES)) UI_H=$(patsubst %, %.h, $(UINAMES)) -all: win libs $(OBJS) xca - -win: $(UI_CPP) $(UI_H) $(MOC_CPP) - make -C lib win +all: libs $(OBJS) xca re: clean all @@ -82,4 +79,4 @@ moc_%.cpp: %.h %.cpp %.cpp: %.h %.ui $(UIC) -o $@ -impl $^ -.INTERMEDIATE: $(MOC_CPP) $(UI_CPP) $(UI_H) +.INTERMEDIATE: $(UI_CPP) $(UI_H) $(MOC_CPP) diff --git a/lib/Makefile.in b/lib/Makefile.in index 736745c8..d6e6765d 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -19,7 +19,6 @@ DBOBJS=db_base.o $(patsubst %,%.o,$(DBNAMES)) $(patsubst %,moc_%.o,$(DBNAMES)) DB_CPP=$(patsubst %,moc_%.cpp,$(DBNAMES)) all: win libpki.a libxcadb.a -win: $(DB_CPP) libpki.a: $(PKIOBJS) ar rcs libpki.a $(PKIOBJS) @@ -37,5 +36,5 @@ distclean: clean moc_%.cpp: %.h %.cpp $(MOC) $< -o $@ - + .INTERMEDIATE: $(DB_CPP) diff --git a/lib/db_base.cpp b/lib/db_base.cpp index 17a8ef73..cdf1220d 100644 --- a/lib/db_base.cpp +++ b/lib/db_base.cpp @@ -425,7 +425,6 @@ QPixmap *db_base::loadImg(const char *name ) #endif path += QDir::separator(); path += name; - QMessageBox::information(NULL, "xca", path); return new QPixmap(path); }