diff options
| author | axis <qt-info@nokia.com> | 2009-06-02 08:14:04 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-02 08:14:04 (GMT) |
| commit | 3c594257c4aedf113de92c5888e74f676ba87385 (patch) | |
| tree | e309c7502e13f552203b509494a20792125fed29 /examples/network | |
| parent | 539989f41316329e7aba69ba97e1579eed6036e6 (diff) | |
| parent | 0ff7b68f2e3f184d809cf6fd13ff930efa493e9f (diff) | |
| download | Qt-3c594257c4aedf113de92c5888e74f676ba87385.zip Qt-3c594257c4aedf113de92c5888e74f676ba87385.tar.gz Qt-3c594257c4aedf113de92c5888e74f676ba87385.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
Diffstat (limited to 'examples/network')
| -rw-r--r-- | examples/network/googlesuggest/googlesuggest.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/network/googlesuggest/googlesuggest.pro b/examples/network/googlesuggest/googlesuggest.pro index afd600f..33b79de 100644 --- a/examples/network/googlesuggest/googlesuggest.pro +++ b/examples/network/googlesuggest/googlesuggest.pro @@ -3,7 +3,7 @@ SOURCES = main.cpp searchbox.cpp googlesuggest.cpp HEADERS = searchbox.h googlesuggest.h # install -target.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlesuggest +target.path = $$[QT_INSTALL_EXAMPLES]/network/googlesuggest sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlesuggest +sources.path = $$[QT_INSTALL_EXAMPLES]/network/googlesuggest INSTALLS += target sources |