diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 20:14:09 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 20:14:09 +0000 |
| commit | 11a83c466cf96c7b6ac8de1673ae4a8402b38324 (patch) | |
| tree | 5a9a49d6cca3deb36329275f65db452a75ee609c /kghostview | |
| parent | 546886fdccdc2bc112e6f9eaf99a34aac1d2234e (diff) | |
| download | tdegraphics-11a83c466cf96c7b6ac8de1673ae4a8402b38324.tar.gz tdegraphics-11a83c466cf96c7b6ac8de1673ae4a8402b38324.zip | |
Fix kdegraphics FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237560 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kghostview')
| -rw-r--r-- | kghostview/Makefile.am | 8 | ||||
| -rw-r--r-- | kghostview/dscparse/dscparse_adapter.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am index 93209382..e087a0f0 100644 --- a/kghostview/Makefile.am +++ b/kghostview/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = data -INCLUDES= $(all_includes) +INCLUDES= $(all_includes) -I$(top_srcdir)/kghostview/dscparse ####### Files @@ -33,12 +33,12 @@ kghostview_LDADD = libkghostviewlib.la libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined libdscparse_la_LIBADD = $(LIB_QT) -libdscparse_la_SOURCES = dscparse.cpp dscparse_adapter.cpp +libdscparse_la_SOURCES = $(top_srcdir)/kghostview/dscparse/dscparse.cpp $(top_srcdir)/kghostview/dscparse/dscparse_adapter.cpp noinst_HEADERS = marklist.h logwindow.h infodialog.h kgvshell.h \ kpswidget.h kgvpageview.h ps.h kgv_miniwidget.h kgv_view.h scrollbox.h \ - kgvpagedecorator.h kgvconfigdialog.h kgvmainwidget.h dscparse.h \ - dscparse_adapter.h kdscerrordialog.h kgvdocument.h displayoptions.h \ + kgvpagedecorator.h kgvconfigdialog.h kgvmainwidget.h $(top_srcdir)/kghostview/dscparse/dscparse.h \ + $(top_srcdir)/kghostview/dscparse/dscparse_adapter.h kdscerrordialog.h kgvdocument.h displayoptions.h \ fullscreenfilter.h kgvfactory.h thumbnailservice.h METASOURCES = AUTO diff --git a/kghostview/dscparse/dscparse_adapter.h b/kghostview/dscparse/dscparse_adapter.h index 5fefa631..3c9c5734 100644 --- a/kghostview/dscparse/dscparse_adapter.h +++ b/kghostview/dscparse/dscparse_adapter.h @@ -185,7 +185,7 @@ public: For = CDSC_FOR, LanguageLevel = CDSC_LANGUAGELEVEL, BoundingBox = CDSC_BOUNDINGBOX, - Qt::Orientation = CDSC_ORIENTATION, + Orientation = CDSC_ORIENTATION, PageOrder = CDSC_PAGEORDER, DocumentMedia = CDSC_DOCUMENTMEDIA, DocumentPaperSizes = CDSC_DOCUMENTPAPERSIZES, @@ -206,7 +206,7 @@ public: // Defaults section BeginDefaults = CDSC_BEGINDEFAULTS, EndDefaults = CDSC_ENDDEFAULTS, - // also %%PageMedia, %%PageQt::Orientation, %%PageBoundingBox + // also %%PageMedia, %%PageOrientation, %%PageBoundingBox // Prolog section BeginProlog = CDSC_BEGINPROLOG, @@ -237,16 +237,16 @@ public: EndPageSetup = CDSC_ENDPAGESETUP, PageMedia = CDSC_PAGEMEDIA, // also %%PaperColor, %%PaperForm, %%PaperWeight, %%PaperSize - PageQt::Orientation = CDSC_PAGEORIENTATION, + PageOrientation = CDSC_PAGEORIENTATION, PageBoundingBox = CDSC_PAGEBOUNDINGBOX, // also %%Begin/EndFont, %%Begin/EndFeature // also %%Begin/EndResource, %%Begin/EndProcSet IncludeFont = CDSC_INCLUDEFONT, - ViewingQt::Orientation = CDSC_VIEWINGORIENTATION, + ViewingOrientation = CDSC_VIEWINGORIENTATION, // Trailer section Trailer = CDSC_TRAILER, - // also %%Pages, %%BoundingBox, %%Qt::Orientation, %%PageOrder, + // also %%Pages, %%BoundingBox, %%Orientation, %%PageOrder, // %%DocumentMedia // %%Page is recognised as an error // also %%DocumentNeededFonts, %%DocumentSuppliedFonts |