Commit Graph

16 Commits

Author SHA1 Message Date
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01: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
Tobias Hunger
0df375a08a FileName: Add method to find parent directories
Change-Id: Ia8382e3f7a9312e0878cce041723973ccf751aae
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-25 17:15:17 +01:00
Daniel Teske
f5d4287123 Use Utils::FileName for various bits in QtVersion
Change-Id: I3afc3a4f2e0dd2671279c2d071779f1d7b277849
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-07 15:05:31 +01:00
Daniel Teske
e9c079a648 Add FileName isChildOf/relativePath and endsWith and appendPath
Needed by qtversionmanager

Change-Id: I4d455298e809b744ae3663493914db6e31f372a6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-12-06 15:54:24 +01:00
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
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
hjk
82bbac7f90 Remove unneeded defines.
Mostly Q_DISABLE_COPY that were covered by the un-copy-ability of the
respective base classes. Includes a few "stylistic" whitespace changes.

Change-Id: I31ca0e7bada5ed0f34776976efe22ddc444a5bf2
Reviewed-on: http://codereview.qt.nokia.com/1609
Reviewed-by: hjk <qthjk@ovi.com>
2011-07-14 12:15:38 +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
Friedemann Kleint
ac9a3bc924 tr()-fixes for 2.3.
Change-Id: I38345500156ce6fa4eb747562a3f9434040615ff
Reviewed-on: http://codereview.qt.nokia.com/473
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-06-14 12:24:40 +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
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