feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
26,129 Commits 108 Branches 368 Tags
33721a85fe71191c600bb9d93162100b3e388e89
Commit Graph

17 Commits

Author SHA1 Message Date
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
e669f05406 Utils: Introduce HostOsInfo class. 
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-27 17:00:03 +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
9c68ad0114 utils: remove 'export' when batch-editing environment variables 
This helps when copy-pasting from e.g. a shell script.

Change-Id: I8beb8f29189d1cd8c85818819c46bf3ed21b5f5a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-21 17:48:06 +01:00
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
Jarek Kobus
fb67842813 Take the old value from edit role when copying variable 
Task-number: QTCREATORBUG-6669

Change-Id: Ife42d13289b924ce9a098b6828a8362808f27b3c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-20 15:29:03 +01:00
Jarek Kobus
062208fdf4 Add a comand line editor for environment variables 
Task-number: QTCREATORBUG-6499

Change-Id: I43df7bddd10776e0fdb192c668ab0d99a6fea7e6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-07 17:48:55 +01:00
Tobias Hunger
0840b93ff5 Fix possible crash in environmentsmodel 
Change-Id: Ib6a3450a7974dc568ba07633a38a29d598a9099f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-12-06 16:02:30 +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
hjk
28535f7571 utils, qmljstools, vcsbase: s/\bm_d\b/d/g 
Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd
Reviewed-on: http://codereview.qt-project.org/4992
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-15 14:11:09 +02:00
hjk
bfd9fcbb3c all: some m_d -> d style 
Change-Id: Iac1f12980bf47666007817cfb2c64a6d1e9b780e
Reviewed-on: http://codereview.qt-project.org/4477
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-08 17:42:14 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01:00
Tobias Hunger
6b92bc3d13 Clean up environmentmodel/widget 
* Move the environment model code to utils and export it
 * rename the environmenteditmodel files to environmentwidget
   (which is the class they actually contain)

Reviewed-by: dt
 2011-01-13 12:21:45 +01:00