Eike Ziller
6fd252b0a5
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessageloghandler.h
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/madde/maemodeployconfigurationwidget.h
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentinfo.h
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/ichecklib_global.h
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
tests/manual/ssh/tunnel/tunnel.h
Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd
Adjust license headers
...
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2012-10-05 17:12:56 +02:00
Christian Kandeler
6e09fa8c70
Utils::FileUtils: Use Utils::FileName for file paths instead of QString.
...
Change-Id: I9ee4c0760820e9299e238c116936ce8ef140c727
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com >
2012-09-07 09:53:14 +02:00
Eike Ziller
1e71dccc9e
Build fix for Mac OS
...
Change-Id: Iec4e4fdddf6b5eadbdcaae2500df841f0cf57dd4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-08-20 09:58:18 +02:00
Yuchen Deng
540c4b19f6
Fix compilation of MinGW-w64 4.7
...
Change-Id: Ieab538a077351549727c94dad17d4d77ab492a97
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-08-17 17:48:04 +02:00
Oswald Buddenhagen
f1d0c37565
properly sync file's data on commit
...
this ensures that creator doesn't eat my config files on every crash.
Change-Id: I18f8135158e17d064774a49fe170b63c89517e49
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com >
2012-08-16 17:22:31 +02:00
Eike Ziller
e0e8cf3ada
Contact -> qt-project.org
...
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-19 13:23:21 +02:00
hjk
2931a499e6
Long live the king!
...
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-01-26 19:55:36 +01:00
Eike Ziller
6e6c9f9884
Don't try finalizing files that were never created.
...
Task-number: QTCREATORBUG-6643
Change-Id: I04945ebb39caace476a12f293666cfcec0f8a9e5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2011-12-05 22:11:52 +01:00
hjk
31600758de
all: s/info@qt.nokia.com/qt-info@nokia.com/
...
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com >
2011-11-03 10:33:19 +01:00
Vlad Brovko
7d22c10143
don't rewrite symlink on save, rewrite target instead
...
Merge-request: 399
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
Change-Id: If81446a8fd49e9de7611c2f09abd39af2c9c930d
2011-10-20 22:33:54 +02:00
Friedemann Kleint
2f92eae7bc
Utils/Coreplugin: Clean headers.
...
Change-Id: I1e0d432127651622d40ff990e1866eac9fac46a0
Reviewed-on: http://codereview.qt.nokia.com/3091
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com >
2011-08-17 12:58:38 +02:00
Tobias Hunger
aa2acec14c
Fix/add copyright headers
...
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
1757217da6
add Utils::SaveFile: class for atomic saving of files
...
inspired by KSaveFile
2011-04-18 14:10:12 +02:00
