diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-07-31 16:32:17 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-07-31 16:32:17 +0200 |
| commit | 40d6261f7d30d372f6a0c9ffdd9fe1cd5b1d1002 (patch) | |
| tree | 605c18ec74560c8a8835e21d2069830b409de142 | |
| parent | 301c1da0c7d93da1f0d8d81e1c5c8d4e677067c2 (diff) | |
| download | krecipes-40d6261f7d30d372f6a0c9ffdd9fe1cd5b1d1002.tar.gz krecipes-40d6261f7d30d372f6a0c9ffdd9fe1cd5b1d1002.zip | |
Update autotools for new DSO linkage style
Fix FTBFS
| -rw-r--r-- | krecipes/src/Makefile.am | 2 | ||||
| -rw-r--r-- | krecipes/src/dialogs/ingredientsdialog.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/krecipes/src/Makefile.am b/krecipes/src/Makefile.am index ed4b0ef..fdea9e0 100644 --- a/krecipes/src/Makefile.am +++ b/krecipes/src/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = backends importers widgets dialogs exporters datablocks tests INCLUDES = -I$(srcdir) -I$(srcdir)/backends -I$(srcdir)/backends/SQLite $(all_includes) # the library search path. -krecipes_LDFLAGS = $(KDE_RPATH) $(all_libraries) +krecipes_LDFLAGS = $(KDE_RPATH) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkdefx -lDCOP $(LIB_QT) $(all_libraries) # Check for optional libs diff --git a/krecipes/src/dialogs/ingredientsdialog.cpp b/krecipes/src/dialogs/ingredientsdialog.cpp index 231d087..ab7012a 100644 --- a/krecipes/src/dialogs/ingredientsdialog.cpp +++ b/krecipes/src/dialogs/ingredientsdialog.cpp @@ -551,12 +551,12 @@ void IngredientsDialog::reloadWeightList( void ) QListViewItem * lastElement = weightsListView->listView() ->lastItem(); Weight w = *weight_it; - WeightListItem *weight_it = new WeightListItem( weightsListView->listView(), lastElement, w ); - weight_it->setAmountUnit( w.perAmount, + WeightListItem *weight_it1 = new WeightListItem( weightsListView->listView(), lastElement, w ); + weight_it1->setAmountUnit( w.perAmount, database->unitName(w.perAmountUnitID), Element((w.prepMethodID==-1)?QString::null:database->prepMethodName(w.prepMethodID),w.prepMethodID) ); - weight_it->setWeightUnit( w.weight, database->unitName(w.weightUnitID) ); + weight_it1->setWeightUnit( w.weight, database->unitName(w.weightUnitID) ); } } } |