diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-24 11:27:17 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-27 07:31:21 +0000 |
commit | 43cebeadbe8d0550aeee4aa35f3c93a9e7e14a34 (patch) | |
tree | 0769a1f41b5e71a38118aef0bbbfb94882b95516 | |
parent | 192de15a4b3b6f750bee5a9a57b86f8a842d9eeb (diff) |
install the pdfviewer example; provide examples subdirs .pro files
Actually moving the files is unfortunately necessary because of a rule
about having the source directory structure match the intended installation
directory structure. It was intended to differentiate widget examples from
future QtQuick examples, but now that distiction is being unfortunately lost
in order to keep the directory structure as shallow as it can still be, after
having to comply with the first rule.
Change-Id: I831227d2be3c8f5cab55a98a531e16bcb3aa0303
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r-- | examples/examples.pro | 2 | ||||
-rw-r--r-- | examples/pdf/pdf.pro | 2 | ||||
-rw-r--r-- | examples/pdf/pdfviewer/images/busy.png (renamed from examples/widgets/pdfviewer/images/busy.png) | bin | 172 -> 172 bytes | |||
-rw-r--r-- | examples/pdf/pdfviewer/images/fileopen.png (renamed from examples/widgets/pdfviewer/images/fileopen.png) | bin | 1771 -> 1771 bytes | |||
-rw-r--r-- | examples/pdf/pdfviewer/images/go-next-24.png (renamed from examples/widgets/pdfviewer/images/go-next-24.png) | bin | 782 -> 782 bytes | |||
-rw-r--r-- | examples/pdf/pdfviewer/images/go-previous-24.png (renamed from examples/widgets/pdfviewer/images/go-previous-24.png) | bin | 797 -> 797 bytes | |||
-rw-r--r-- | examples/pdf/pdfviewer/images/zoom-in-24.png (renamed from examples/widgets/pdfviewer/images/zoom-in-24.png) | bin | 1302 -> 1302 bytes | |||
-rw-r--r-- | examples/pdf/pdfviewer/images/zoom-in-32.png (renamed from examples/widgets/pdfviewer/images/zoom-in-32.png) | bin | 1873 -> 1873 bytes | |||
-rw-r--r-- | examples/pdf/pdfviewer/images/zoom-out-24.png (renamed from examples/widgets/pdfviewer/images/zoom-out-24.png) | bin | 1247 -> 1247 bytes | |||
-rw-r--r-- | examples/pdf/pdfviewer/images/zoom-out-32.png (renamed from examples/widgets/pdfviewer/images/zoom-out-32.png) | bin | 1749 -> 1749 bytes | |||
-rw-r--r-- | examples/pdf/pdfviewer/main.cpp (renamed from examples/widgets/pdfviewer/main.cpp) | 0 | ||||
-rw-r--r-- | examples/pdf/pdfviewer/mainwindow.cpp (renamed from examples/widgets/pdfviewer/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/pdf/pdfviewer/mainwindow.h (renamed from examples/widgets/pdfviewer/mainwindow.h) | 0 | ||||
-rw-r--r-- | examples/pdf/pdfviewer/mainwindow.ui (renamed from examples/widgets/pdfviewer/mainwindow.ui) | 0 | ||||
-rw-r--r-- | examples/pdf/pdfviewer/pagerenderer.cpp (renamed from examples/widgets/pdfviewer/pagerenderer.cpp) | 0 | ||||
-rw-r--r-- | examples/pdf/pdfviewer/pagerenderer.h (renamed from examples/widgets/pdfviewer/pagerenderer.h) | 0 | ||||
-rw-r--r-- | examples/pdf/pdfviewer/pdfviewer.pro (renamed from examples/widgets/pdfviewer/pdfviewer.pro) | 4 | ||||
-rw-r--r-- | examples/pdf/pdfviewer/resources.qrc (renamed from examples/widgets/pdfviewer/resources.qrc) | 0 | ||||
-rw-r--r-- | examples/pdf/pdfviewer/sequentialpagewidget.cpp (renamed from examples/widgets/pdfviewer/sequentialpagewidget.cpp) | 0 | ||||
-rw-r--r-- | examples/pdf/pdfviewer/sequentialpagewidget.h (renamed from examples/widgets/pdfviewer/sequentialpagewidget.h) | 0 |
20 files changed, 8 insertions, 0 deletions
diff --git a/examples/examples.pro b/examples/examples.pro new file mode 100644 index 0000000..c3b9cb3 --- /dev/null +++ b/examples/examples.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS += pdf diff --git a/examples/pdf/pdf.pro b/examples/pdf/pdf.pro new file mode 100644 index 0000000..a12dc5b --- /dev/null +++ b/examples/pdf/pdf.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS += pdfviewer diff --git a/examples/widgets/pdfviewer/images/busy.png b/examples/pdf/pdfviewer/images/busy.png Binary files differindex 69056c4..69056c4 100644 --- a/examples/widgets/pdfviewer/images/busy.png +++ b/examples/pdf/pdfviewer/images/busy.png diff --git a/examples/widgets/pdfviewer/images/fileopen.png b/examples/pdf/pdfviewer/images/fileopen.png Binary files differindex 33e0d63..33e0d63 100644 --- a/examples/widgets/pdfviewer/images/fileopen.png +++ b/examples/pdf/pdfviewer/images/fileopen.png diff --git a/examples/widgets/pdfviewer/images/go-next-24.png b/examples/pdf/pdfviewer/images/go-next-24.png Binary files differindex 9a55ef3..9a55ef3 100644 --- a/examples/widgets/pdfviewer/images/go-next-24.png +++ b/examples/pdf/pdfviewer/images/go-next-24.png diff --git a/examples/widgets/pdfviewer/images/go-previous-24.png b/examples/pdf/pdfviewer/images/go-previous-24.png Binary files differindex 2ea769e..2ea769e 100644 --- a/examples/widgets/pdfviewer/images/go-previous-24.png +++ b/examples/pdf/pdfviewer/images/go-previous-24.png diff --git a/examples/widgets/pdfviewer/images/zoom-in-24.png b/examples/pdf/pdfviewer/images/zoom-in-24.png Binary files differindex d29b142..d29b142 100644 --- a/examples/widgets/pdfviewer/images/zoom-in-24.png +++ b/examples/pdf/pdfviewer/images/zoom-in-24.png diff --git a/examples/widgets/pdfviewer/images/zoom-in-32.png b/examples/pdf/pdfviewer/images/zoom-in-32.png Binary files differindex 34d70af..34d70af 100644 --- a/examples/widgets/pdfviewer/images/zoom-in-32.png +++ b/examples/pdf/pdfviewer/images/zoom-in-32.png diff --git a/examples/widgets/pdfviewer/images/zoom-out-24.png b/examples/pdf/pdfviewer/images/zoom-out-24.png Binary files differindex 1970347..1970347 100644 --- a/examples/widgets/pdfviewer/images/zoom-out-24.png +++ b/examples/pdf/pdfviewer/images/zoom-out-24.png diff --git a/examples/widgets/pdfviewer/images/zoom-out-32.png b/examples/pdf/pdfviewer/images/zoom-out-32.png Binary files differindex b832206..b832206 100644 --- a/examples/widgets/pdfviewer/images/zoom-out-32.png +++ b/examples/pdf/pdfviewer/images/zoom-out-32.png diff --git a/examples/widgets/pdfviewer/main.cpp b/examples/pdf/pdfviewer/main.cpp index 20fa6f8..20fa6f8 100644 --- a/examples/widgets/pdfviewer/main.cpp +++ b/examples/pdf/pdfviewer/main.cpp diff --git a/examples/widgets/pdfviewer/mainwindow.cpp b/examples/pdf/pdfviewer/mainwindow.cpp index d865a8b..d865a8b 100644 --- a/examples/widgets/pdfviewer/mainwindow.cpp +++ b/examples/pdf/pdfviewer/mainwindow.cpp diff --git a/examples/widgets/pdfviewer/mainwindow.h b/examples/pdf/pdfviewer/mainwindow.h index dedc812..dedc812 100644 --- a/examples/widgets/pdfviewer/mainwindow.h +++ b/examples/pdf/pdfviewer/mainwindow.h diff --git a/examples/widgets/pdfviewer/mainwindow.ui b/examples/pdf/pdfviewer/mainwindow.ui index 7070619..7070619 100644 --- a/examples/widgets/pdfviewer/mainwindow.ui +++ b/examples/pdf/pdfviewer/mainwindow.ui diff --git a/examples/widgets/pdfviewer/pagerenderer.cpp b/examples/pdf/pdfviewer/pagerenderer.cpp index c8f2456..c8f2456 100644 --- a/examples/widgets/pdfviewer/pagerenderer.cpp +++ b/examples/pdf/pdfviewer/pagerenderer.cpp diff --git a/examples/widgets/pdfviewer/pagerenderer.h b/examples/pdf/pdfviewer/pagerenderer.h index 5feccaa..5feccaa 100644 --- a/examples/widgets/pdfviewer/pagerenderer.h +++ b/examples/pdf/pdfviewer/pagerenderer.h diff --git a/examples/widgets/pdfviewer/pdfviewer.pro b/examples/pdf/pdfviewer/pdfviewer.pro index e8269c4..10cacce 100644 --- a/examples/widgets/pdfviewer/pdfviewer.pro +++ b/examples/pdf/pdfviewer/pdfviewer.pro @@ -15,3 +15,7 @@ FORMS += mainwindow.ui RESOURCES += \ resources.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/pdf/pdfviewer +INSTALLS += target + diff --git a/examples/widgets/pdfviewer/resources.qrc b/examples/pdf/pdfviewer/resources.qrc index 02d9655..02d9655 100644 --- a/examples/widgets/pdfviewer/resources.qrc +++ b/examples/pdf/pdfviewer/resources.qrc diff --git a/examples/widgets/pdfviewer/sequentialpagewidget.cpp b/examples/pdf/pdfviewer/sequentialpagewidget.cpp index 904bc17..904bc17 100644 --- a/examples/widgets/pdfviewer/sequentialpagewidget.cpp +++ b/examples/pdf/pdfviewer/sequentialpagewidget.cpp diff --git a/examples/widgets/pdfviewer/sequentialpagewidget.h b/examples/pdf/pdfviewer/sequentialpagewidget.h index 85f3571..85f3571 100644 --- a/examples/widgets/pdfviewer/sequentialpagewidget.h +++ b/examples/pdf/pdfviewer/sequentialpagewidget.h |