delta/qt-creator.git/src/plugins/qtsupport/baseqtversion.cpp, branch baserock/3.3.0 code.qt.io: qt-creator/qt-creator.git QtSupport: Fix wrong build directory for examples 2014-12-08T12:58:49+00:00 Daniel Teske daniel.teske@theqtcompany.com 2014-12-08T12:47:47+00:00 d36c4d87dbf9ac045edfff257cf3f7083bf0ea65 By partially reverting 92fbbaea9b4d96f88d556c12cb40c5382a53df70 Task-number: QTCREATORBUG-13630 Change-Id: Ia04a224f2a12839d2cf27828009c945383a4c19c Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> 
By partially reverting 92fbbaea9b4d96f88d556c12cb40c5382a53df70

Task-number: QTCREATORBUG-13630
Change-Id: Ia04a224f2a12839d2cf27828009c945383a4c19c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Qt Quick Compiler Support: Only allow valid settings 2014-12-01T07:45:22+00:00 Alessandro Portale alessandro.portale@digia.com 2014-11-25T17:23:15+00:00 245ea90817014422bcce964d1b7aa8deeb7a981d If the Qt Quick Compiler binary is not present in the binary tools directory of the Qt version, disable the checkbox. A warning will be added in the next minor version, sind we already have string freeze. QML debugging does not work when using the Qt Quick Compiler. So, in case the Qt Quick Compiler is checked, let's disable the QML debugging checkbox. Change-Id: I739b1f71dc53aca9cf00e6ffd15246184d89816b Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com> 
If the Qt Quick Compiler binary is not present in the binary tools
directory of the Qt version, disable the checkbox. A warning will
be added in the next minor version, sind we already have string
freeze.

QML debugging does not work when using the Qt Quick Compiler. So,
in case the Qt Quick Compiler is checked, let's disable the QML
debugging checkbox.

Change-Id: I739b1f71dc53aca9cf00e6ffd15246184d89816b
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
BaseQtVersion: Rename isInSourceDirectory to isSubProject and fix it 2014-11-21T12:55:50+00:00 Daniel Teske daniel.teske@theqtcompany.com 2014-11-20T17:27:01+00:00 92fbbaea9b4d96f88d556c12cb40c5382a53df70 The source and examples directory is not a sub directory of the qt source directory in the sdks. But we still want to treat it as part of a the matching qt. Task-number: QTCREATORBUG-13469 Change-Id: Ib63722052a14c29e4198c879dd770fb4ecdcdb80 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> 
The source and examples directory is not a sub directory of the qt
source directory in the sdks. But we still want to treat it as part
of a the matching qt.

Task-number: QTCREATORBUG-13469
Change-Id: Ib63722052a14c29e4198c879dd770fb4ecdcdb80
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
QtSupport: Fix mkspec detection for Qt4/MinGW. 2014-11-14T11:32:16+00:00 Christian Kandeler christian.kandeler@theqtcompany.com 2014-11-14T09:04:36+00:00 620ded809355d43b00723349539171618e8e668e This is a workaround for QTBUG-28792. Change-Id: I6a6de3a44569563e6013a388875035bda9772bed Task-number: QBS-703 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> 
This is a workaround for QTBUG-28792.

Change-Id: I6a6de3a44569563e6013a388875035bda9772bed
Task-number: QBS-703
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possible 2014-11-03T08:31:28+00:00 hjk hjk121@nokiamail.com 2014-10-24T08:28:28+00:00 a439483d704113286370e7e93e0e6bc16199d8ab Faster. Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81 Reviewed-by: Marc Reilly <marc.reilly@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> 
Faster.

Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81
Reviewed-by: Marc Reilly <marc.reilly@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Detect qt sub projects and special case their build directory 2014-10-24T11:24:58+00:00 Daniel Teske daniel.teske@digia.com 2014-10-20T15:23:07+00:00 b9a7cfcaa1f058c6d6b123c6d9abaa9da92d9f5a Check every project's path against the source paths of all existing qts. If we find a match, make it build in the right place by default. Works for both in source and shadow builds. Note: There's a quadratic algorithm since foreach kit we check against all qt versions. That's unlikely to be a problem and non trivial to fix. Change-Id: I9f3456f3e835ee6adc35c26fe5c328c01387a8aa Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> 
Check every project's path against the source paths of all existing qts.
If we find a match, make it build in the right place by default.
Works for both in source and shadow builds.

Note: There's a quadratic algorithm since foreach kit we check against
all qt versions. That's unlikely to be a problem and non trivial to
fix.

Change-Id: I9f3456f3e835ee6adc35c26fe5c328c01387a8aa
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Qt version: Fix macro usage in default display names 2014-10-24T09:56:12+00:00 Eike Ziller eike.ziller@theqtcompany.com 2014-10-24T09:39:22+00:00 7735dd6e9470c0c682fdfd2732371ba7e0c18ecf The variables were changed to start with uppercase characters Change-Id: I0173e5c943395aa2729d873f9ef7e5d860e906ec Reviewed-by: hjk <hjk121@nokiamail.com> 
The variables were changed to start with uppercase characters

Change-Id: I0173e5c943395aa2729d873f9ef7e5d860e906ec
Reviewed-by: hjk <hjk121@nokiamail.com>
Capitalize macro names 2014-10-22T13:10:05+00:00 hjk hjk121@nokiamail.com 2014-10-22T12:25:15+00:00 6f570684e04cb7f10b6636868a7c3e4a34862a71 Change-Id: I6492d625ede6c4425e5dd4b6f19a327f1931f64c Reviewed-by: Orgad Shaneh <orgads@gmail.com> 
Change-Id: I6492d625ede6c4425e5dd4b6f19a327f1931f64c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Make expanders work with subexpanders 2014-10-21T14:20:07+00:00 hjk hjk121@nokiamail.com 2014-10-20T21:13:13+00:00 c6ef3addcc73ebf69cf21b5ba947e59bd9587f15 Change-Id: I30bad85ce2fbaf1f02043b3d97f657461f5a1995 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> 
Change-Id: I30bad85ce2fbaf1f02043b3d97f657461f5a1995
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
MacroExpander: Fall back to global expander 2014-10-16T14:32:58+00:00 hjk hjk121@nokiamail.com 2014-10-15T12:45:31+00:00 ef563d8085752708d9b623ab50bc42cdd69a3262 ... and use that all over the place. Change-Id: Ie6e0ed0f0d9eaba9b4466761e6b455f33a905086 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> 
... and use that all over the place.

Change-Id: Ie6e0ed0f0d9eaba9b4466761e6b455f33a905086
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>