feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,085 Commits 108 Branches 368 Tags
a082365d65e4adc2a3526261224d407ef4cdaaff
Commit Graph

12 Commits

Author SHA1 Message Date
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Daniel Teske
041fe253e3 Fix qt namespace compile, move qHash(Utils::FileName) to qt namespace 
Change-Id: Ic099176bc204ef25de34e80d8e592c2229a41aab
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-09 15:18:29 +01:00
Daniel Teske
7daf1c58af Introduce Utils::FileName class 
Change-Id: I1a0573ad8fcf2efc945ea74d9f9851ea7762a210
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-08 20:13:35 +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
Oswald Buddenhagen
1b9c9f74c7 move api docs to ... the api 
\fn is a fallback for stuff from headers

Change-Id: I7c5a187bf2cfae2682fd267f30da479488d2592e
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-10-21 15:59:20 +02: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
Christian Kandeler
164cd970e5 FileUtils: Add some safety checks to removeRecursively(). 
Change-Id: I657f8416081ce7d253f4a3ef9722a39ac34b5f24
Reviewed-on: http://codereview.qt.nokia.com/1955
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-22 11:15:23 +02:00
Daniel Molkentin
15732d1bd2 RemoteLinux: Move generic Dir/File functions into Utils. 
- Make error parameter an optional pointer
  for consistency with DirUtils::copyRecursively()
- Add documentation

Change-Id: I6671142341dbdcf2c8ca1118c35ea05548920609
Reviewed-on: http://codereview.qt.nokia.com/1090
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-06 12:38:11 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Friedemann Kleint
acd9e931e3 Compile Mac. 2011-04-20 13:51:08 +02:00
Oswald Buddenhagen
f4342efc4d fix setResult(QDataStream *) 
it was apparent only with qt 4.8
 2011-04-18 15:40:10 +02:00
Oswald Buddenhagen
9a89f573e0 add fileutils: classes for error-checked reading and writing of files 
the internal use of SaveFile ensures that we don't leave truncated
pre-existing files behind if the disk is full or something else bad
happens.

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:12 +02:00