diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-21 15:21:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-21 15:21:21 (GMT) |
| commit | 27c18a5cd8dbe2d22c8717044922ad5437e6fff4 (patch) | |
| tree | ad3665425efea292c5383bf11ba59075db3747b4 /examples | |
| parent | beef4e0f938142aedcaccbd9bfbfb4101c433853 (diff) | |
| parent | ff187688e113ec157dd14abcef0faf602b68901c (diff) | |
| download | Qt-27c18a5cd8dbe2d22c8717044922ad5437e6fff4.zip Qt-27c18a5cd8dbe2d22c8717044922ad5437e6fff4.tar.gz Qt-27c18a5cd8dbe2d22c8717044922ad5437e6fff4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: (29 commits)
Doc: Added a missing license header.
doc: Replaced some \raw and \endraw uses with \table and \endtable
doc: Replaced some \raw and \endraw uses with \table and \endtable
doc: Replaced some \raw and \endraw uses with \table and \endtable
Doc: Added a note about the Public Suffix List.
Doc: Fixed doc bug in Diagram Scene example
doc: Removed some empty \row commands from a table.
Doc: Added link to QML Basic Types in main Qt Quick page.
Doc: Added missing What's New information for Qt 4.6 and 4.7.
Doc: Fixed incorrect case in a page file name.
Doc: Added a link to the QML Basic Types page.
Doc: Removed duplicate external page reference.
Doc: Fixed a link to the correct searchPaths() function.
Doc: Added documentation about the use of null custom title bar widgets.
Doc: Added a missing external page reference.
Fixed the QML Focus document. Fixed snippets, images, and formatting.
Added QML coding convention for "private" properties.
Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.
Some whitespace fixes.
Fixed a bug by changing the id name to lower case.
...
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/tools/echoplugin/echowindow/echowindow.pro | 4 | ||||
| -rw-r--r-- | examples/tools/styleplugin/plugin/plugin.pro | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/tools/echoplugin/echowindow/echowindow.pro b/examples/tools/echoplugin/echowindow/echowindow.pro index bdf8c41..d56961c 100644 --- a/examples/tools/echoplugin/echowindow/echowindow.pro +++ b/examples/tools/echoplugin/echowindow/echowindow.pro @@ -5,8 +5,8 @@ SOURCES = echowindow.cpp \ TARGET = echoplugin win32 { - debug:DESTDIR = ../debug/ - release:DESTDIR = ../release/ + CONFIG(debug, release|debug):DESTDIR = ../debug/ + CONFIG(release, release|debug):DESTDIR = ../release/ } else { DESTDIR = ../ } diff --git a/examples/tools/styleplugin/plugin/plugin.pro b/examples/tools/styleplugin/plugin/plugin.pro index 7cb0c97..54e266c 100644 --- a/examples/tools/styleplugin/plugin/plugin.pro +++ b/examples/tools/styleplugin/plugin/plugin.pro @@ -8,8 +8,8 @@ SOURCES = simplestyle.cpp \ TARGET = simplestyleplugin #! [0] win32 { - debug:DESTDIR = ../debug/styles/ - release:DESTDIR = ../release/styles/ + CONFIG(debug, release|debug):DESTDIR = ../debug/styles/ + CONFIG(release, release|debug):DESTDIR = ../release/styles/ } else { DESTDIR = ../styles/ } |