diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-22 14:57:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-22 14:57:51 (GMT) |
| commit | 91bc1f39788a4a097e65f542b8515c68313ec17f (patch) | |
| tree | 111f23861ce66ca30a17189fb611ff3854b57d66 /examples | |
| parent | edd574758bdc4223a3d38b0f5cd0e1f11c537b55 (diff) | |
| parent | 4c47a46be986681225b67faa73f957276636cc30 (diff) | |
| download | Qt-91bc1f39788a4a097e65f542b8515c68313ec17f.zip Qt-91bc1f39788a4a097e65f542b8515c68313ec17f.tar.gz Qt-91bc1f39788a4a097e65f542b8515c68313ec17f.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (43 commits)
Doc: Added a missing license header.
Fix timer warning when deleting item views
More testing for KeyNavigation attached properties.
Add tests for ListView.indexAt() and GridView.IndexAt()
runonphone: Only print the modprobe instructions on linux
reword: Make the USB serial device enumeration work on OS X, too
runonphone: Check that the device->config is valid before dereferencing it
Remove few compile warnings
Fix using QFileDialog statics in Symbian.
Setting TextInput.cursorPosition outside bounds crashed.
Update test bitmaps for QDeclarativeImage::svg() autotest on Windows
Don't truncate image:// url strings prematurely
Update docs on importing javascript files
Fix deployment of minehunt for Symbian
Quiet unused parameter warnings.
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
...
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/ } |