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

16 Commits

Author SHA1 Message Date
Friedemann Kleint
67bde11f1b QtSupport: Compile with QT_NO_CAST_FROM_ASCII. 
Change-Id: I893b225601a073bc5d74199dba3323f3e233560e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-09 12:54:08 +01:00
Eike Ziller
8cc3844038 Allow build to specify different settings path. 
Task-number: QTCREATORBUG-5509
Change-Id: I4541049a1861e83f55106effc536fd50eb233d97
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-12-16 08:48:31 +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
Eike Ziller
e2b0835b58 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
 2011-11-25 09:48:25 +01:00
Daniel Teske
d530e8ddb8 Don't offer Makefile.Debug and Makefile.Release for importing 
Task-number: QTCREATORBUG-6562
Change-Id: I1630d7c13ab59d848626a4a4b8fb542765a16d6e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-22 12:48:23 +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
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
Daniel Teske
d2243c9765 Add a maximum Qt Version to the wizards 
All existing wizards derived from AbstractMobileWizard do not support qt
5. So they won't offer them, nor default to them.

Task-number: QTCREATORBUG-6321
Change-Id: I999e2565cec5b0d7da04c10e38ac2cb101352e5b
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-10-20 11:58:37 +02:00
Jarek Kobus
2244911826 Implement Code Style schemes 
Task-number: QTCREATORBUG-5092

Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-23 10:23:15 +02:00
Daniel Teske
e21c7372ab Disable debug output in QtVersionManager::updateFromInstaller() 
Change-Id: Ifc1f037796a4a59585f34c8b043d0573c88959da
Reviewed-on: http://codereview.qt.nokia.com/2402
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-29 23:45:27 +02:00
Kai Koehne
8d85597aae DebuggingHelpers: Update after built for newly added versions 
One can already build debugging helpers for Qt Versions not yet
registered to QtVersionManager - which resulted in a QTC_ASSERT
+ the changes after the built were not picked up.

Change-Id: I12a769df6e18a05b0d1677fd913f4064efed3429
Reviewed-on: http://codereview.qt.nokia.com/2168
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-27 08:17:21 +02:00
Daniel Teske
675072f111 Remove old qt version settings on upgrade. 
Change-Id: I1544c4c241fced2015d2bdfb57a70ce828223786
Reviewed-on: http://codereview.qt.nokia.com/1080
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-04 14:56:40 +02:00
Daniel Teske
ca9a94a0ae Remove redudant updateDocumentation 
Change-Id: I1967c5f1101dcbc1097c7fe6f26a195f658eab67
Reviewed-on: http://codereview.qt.nokia.com/1007
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-01 14:11:12 +02:00
Christian Kandeler
0ff8e646db QtSupport: Additional parameter for QtVersion::restore(). 
This enables a QtVersionFactory to be able to create more than one
QtVersion, which can make sense e.g. if there are several closely
related ones.

Change-Id: I597f524abfc27c483c71bb6567ce7b77bc3d3041
Reviewed-on: http://codereview.qt.nokia.com/835
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-28 16:05:09 +02:00
Friedemann Kleint
a56162ec6e tr()-Fixes for 2.3: No contractions, spelling. 
Change-Id: I08babdb15bcf7f7ac086e9e12955b780b7591391
Reviewed-on: http://codereview.qt.nokia.com/480
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-14 17:18:48 +02:00
dt
754be1bcfc Move a lot of qmake independent classes to a new plugin qtsupport 
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.

Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-24 18:35:11 +02:00