feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
20,382 Commits 108 Branches 368 Tags
72465c45e345ea37eacdf465eafedd6dd2ecdb2e
Commit Graph

23 Commits

Author SHA1 Message Date
Friedemann Kleint
796e1fb442 QtVersion: Set qmakeIsExecutable to false if qmake crashes. 
This prevents literally dozens of crash dialog boxes on Windows.
Check for a crash in the helper library and in updateVersionInfo
consistently whatever is called first.
Initialize qmakeIsExecutable in 2nd constructor as well.

Change-Id: Ifafb7b3edfae8826ac062d634a39a2a804446942
Reviewed-on: http://codereview.qt.nokia.com/1661
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-29 15:22:09 +02:00
Daniel Teske
58cd24846c Clean up before building debugging helpers 
Task-number: QTCREATORBUG-5532
Change-Id: Ic00b486c8bad9b7f4abc61cbd55893b236c4c8cc
Reviewed-on: http://codereview.qt.nokia.com/1880
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-22 11:47:57 +02:00
hjk
fda652a43e debugger: rename gdbmacros* to dumper* 
Was mis-named from the beginning.

(cherry picked from commit 2f119dc2f85b28274d47ff635188872d5ed11521)

Change-Id: I4f2e388edfdded117c5b35d3d04bbdc68d77afa4
Reviewed-on: http://codereview.qt.nokia.com/872
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 10:21:55 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Kai Koehne
af9a307c15 QmlJSDebug: Enable compilation of library also for Symbian 2011-04-29 15:08:43 +02:00
Kai Koehne
001793fe79 DebuggingHelpers: Put long argument list into one struct 2011-04-29 15:08:43 +02:00
Kai Koehne
f86c9b6572 QmlDump: Ensure that qmldump is found in QtSDK 
We ship a precompiled qmldump in the Qt SDK because the Qt versions
don't have private headers. However, the logic in buildablehelperlibrary
by default rejects any build that is older than the latest changes to the
qmldump source code files; allow Qt Creator to pick up the (maybe
outdated) qmldump nevertheless if no private headers are installed.

Reviewed-by: ckamm
Task-number: QTCREATORBUG-4578
 2011-04-18 15:38:03 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
dt
a9963b6313 QtVersionManager: Introduce qtVersionNumber + various fixes 
Make the internal data structure a map from id to Version, simplfing a few
functions. Return sorted lists, with newer versions in front for various
functions, e.g. validVersions(), versionsForTargetId.
 2011-02-22 15:35:23 +01:00
Christian Kamm
e236c5de5f Compiled helpers: Use only ones that are newer than all source files. 
Reviewed-by: Kai Koehne
 2011-02-18 14:58:22 +01:00
Kai Koehne
a64020c462 DebuggingHelpers: Improve log 2011-02-18 12:57:45 +01:00
Kai Koehne
3fef120d59 QmlJSDebug: Move qmljsdebug into a static library 
Reviewed-by: dt
 2011-02-18 12:57:45 +01:00
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Kai Koehne
71376673e1 QmlObserver: Fix automatic compilation with latest patches 
Don't enumerate all files to be copied any more, but copy whole
subdirectory tree.
 2010-12-10 13:25:26 +01:00
Tobias Hunger
b7796bf309 Make sure we do not get "//" in the QMake path 
Task-number: QTCREATORBUG-2990
 2010-11-08 11:30:35 +01:00
Kai Koehne
00a9766408 DebugHelpers: Use static QRegExp for performance reasons 
Reviewed-by: Bill King
 2010-11-08 09:43:49 +01:00
Friedemann Kleint
f5909abe09 Debugging helpers: Fix building 
- Report errors correctly.
- Do not pass empty target argument to qmake
- Give 'make' a longer timeout and change timeout checking to
  trigger after last output line was obtained from process
- Make build log dialog non-modal and ensure it pops up on failure
  even if a different Qt version was selected in-between
- Disable Rebuild-button while build is running.

Reviewed-by: Kai Köhne <kai.koehne@nokia.com>
Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
 2010-10-08 15:13:02 +02:00
Friedemann Kleint
2b047a2680 Building debugging helpers: Increase timeout to 80000ms. 
Reviewed-by: hjk
 2010-10-06 14:56:18 +02:00
Kai Koehne
88a36fe34c DebuggingHelpers: Check for Qt version instead checking private files 
The location private includes might still change with 4.7.1 . Better
check the qt version string.

Reviewed-by: Lasse Holmstedt
 2010-09-30 12:02:26 +02:00
Lasse Holmstedt
5d9858129a Compile qmldump with debugging helpers 
Must be compiled during runtime - otherwise, the app may not work
with Qt that is compiled with another compiler.

Reviewed-by: hjk
 2010-09-29 09:39:18 +02:00