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

17 Commits

Author SHA1 Message Date
hjk
fa66a540fd fix C++11 string literal incompatibility 
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-22 15:51:41 +01:00
Eike Ziller
fbd47e25ee Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
 2011-11-18 10:16:49 +01:00
Hugues Delorme
8225956d17 Bazaar: fix jumping into file from diff view 
From a diff view, jumping into 'added' files wasn't working.
Actually file jumping was working only for 'modified' files.
This is fixed by using a more general diff regexp in class
BazaarEditor (attribute m_diffFileId)

This bugfix also allows to highlight all diff specs (rename, remove, ...)

Task-number: QTCREATORBUG-6531
Change-Id: I80bcbc0f77644c6caa7e7c750bd474a12263b589
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-16 13:55:08 +01:00
Hugues Delorme
d4a4ca5054 Bazaar: whitespace and indentation fixes 
Change-Id: I31258a10bd79a047f25787d38c070b0c95ed9f78
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-14 10:29: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
cerf
e7b7b5f230 Bazaar: fix incomplete list of files in the diff editor 
BazaarEditor::fileNameFromDiffSpecification() was not seeing all lines
starting with "+++ file".
Searching for "=== modified file 'file'" instead solves the problem

Change-Id: Ib1d4c839543f0f8cc00ecbfaa177b369a4c20ee1
Merge-request: 330
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/78
 2011-05-24 12:07:53 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
d7cddd4e17 VCS[Bazaar, Mercurial]: Add diff formatting, revert chunk. 
Add toolbar controls for ignore-whitespace to editors
and wire 'Revert Chunk' context menus.

Fix Bazaar diff interaction (find the file on doubleclick).

Introduce initializeDiffEditor to BaseClient and wire the editors
there.
 2011-03-28 11:59:26 +02:00
cerf
d23d7cbc12 Bazaar: fix code folding markers in the diff view 
The top-level marker is now centered on the line starting with '==='

Merge-request: 274
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-16 17:29:13 +01:00
cerf
2c088f06a0 Bazaar: fix jumping to the changes from the blame view 
Merge-request: 273
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-16 17:29:12 +01:00
cerf
53ba19a102 Bazaar plugin : corrected whitespaces and indentation 
Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-16 17:29:06 +01:00
cerf
9494352abf Bazaar: fix code folding markers in the diff view 
The top-level marker is now centered on the line starting with '==='

Merge-request: 274
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-14 19:32:42 +01:00
cerf
6971466eaa Bazaar: fix jumping to the changes from the blame view 
Merge-request: 273
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-14 17:52:50 +01:00
cerf
2e6a391966 Bazaar plugin : corrected whitespaces and indentation 
Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-11 15:32:11 +01:00
cerf
f9bb4c59dc Added new Bazaar plugin 
Merge-request: 229
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-02-28 16:08:38 +01:00