diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-24 18:06:51 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-24 18:06:51 (GMT) |
| commit | f37c49985f2382b86fe91f7b7224c8fd92961ac9 (patch) | |
| tree | 9a05328fa1dc668a7d3d7143f99de39e5f795387 /examples/scroller/plot/plot.pro | |
| parent | 16b11332931caef92bd103d854fac4dff3ff771e (diff) | |
| parent | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff) | |
| download | Qt-f37c49985f2382b86fe91f7b7224c8fd92961ac9.zip Qt-f37c49985f2382b86fe91f7b7224c8fd92961ac9.tar.gz Qt-f37c49985f2382b86fe91f7b7224c8fd92961ac9.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
Diffstat (limited to 'examples/scroller/plot/plot.pro')
| -rw-r--r-- | examples/scroller/plot/plot.pro | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/examples/scroller/plot/plot.pro b/examples/scroller/plot/plot.pro deleted file mode 100644 index 04fdf70..0000000 --- a/examples/scroller/plot/plot.pro +++ /dev/null @@ -1,13 +0,0 @@ -HEADERS = settingswidget.h \ - plotwidget.h -SOURCES = settingswidget.cpp \ - plotwidget.cpp \ - main.cpp - -QT += webkit - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/scroller/plot -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plot.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/scroller/plot -INSTALLS += target sources |