diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-09 14:27:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-09 14:27:29 +0200 |
| commit | 086dd684ab0e349916ecf4c6b80d265788dbfac8 (patch) | |
| tree | c9d098fefe81a6207a928b7cee0424282cd9e5da /tests/manual/debugger | |
| parent | 8bed5c33f9547de37d2b0a821205a9158e42b0e7 (diff) | |
| parent | 996479e64fba04cd0c42b9f6c8eca82398cd01db (diff) | |
| download | qt-creator-086dd684ab0e349916ecf4c6b80d265788dbfac8.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/coreplugin/fileiconprovider.cpp
src/plugins/cppeditor/cppplugin.cpp
tests/auto/qml/qmldesigner/coretests/coretests.pro
Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7
Diffstat (limited to 'tests/manual/debugger')
| -rw-r--r-- | tests/manual/debugger/simple/simple_test_app.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index fe994a927c..c18ed88a95 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -3592,9 +3592,9 @@ namespace qurl { void testQUrl() { - QUrl url(QString("http://www.nokia.com")); + QUrl url(QString("http://qt-project.org")); BREAK_HERE; - // Check url "http://www.nokia.com" QUrl. + // Check url "http://qt-project.org" QUrl. // Continue. dummyStatement(&url); } |