diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 13:10:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 13:10:42 (GMT) |
| commit | e2abcf0d8e83a9403c57b1504a663310e888e2dd (patch) | |
| tree | d620066a4449a95ded03078be6f901e9fd212224 /src | |
| parent | 86fb4d8754b0d01e88238c3d2af4c28e3624d702 (diff) | |
| parent | 06ef461b5374c42370fc350f53dba76a5d4c62f4 (diff) | |
| download | Qt-e2abcf0d8e83a9403c57b1504a663310e888e2dd.zip Qt-e2abcf0d8e83a9403c57b1504a663310e888e2dd.tar.gz Qt-e2abcf0d8e83a9403c57b1504a663310e888e2dd.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
test: Fix `tst_qfiledialog' in a namespaced build
Fix files that don't end with a newline character
tests: Skip `qaudioinput' tests if there is no audio backend available
tests: fixed crash of tst_qdialog
tests: fixed crash of tst_qdialog
Fix QString compares to ""
Add test case name and drop parentheses for -datatags option.
Adding QTDIR validation in tst_symbols autotest
Disabled benchmarks referring to private headers.
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
Add license header to printdatatags autotests
Compile on symbian^3
Compile on Symbian^3.
Added -datatags option to QTestLib
Fixed failure of tst_qxmlquery::evaluateToReceiver
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_win_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog_win_p.h b/src/gui/dialogs/qfiledialog_win_p.h index 1ff29d2..1408057 100644 --- a/src/gui/dialogs/qfiledialog_win_p.h +++ b/src/gui/dialogs/qfiledialog_win_p.h @@ -240,4 +240,4 @@ DECLARE_INTERFACE_(IFileOpenDialog, IFileDialog) STDMETHOD(GetResults)(THIS_ IShellItemArray **ppenum) PURE; STDMETHOD(GetSelectedItems)(THIS_ IShellItemArray **ppsai) PURE; }; -#endif
\ No newline at end of file +#endif |