summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Do not embed rpath to external libraries3.5Adam Majer2015-10-232-2/+4
| | | | | | | | | | Some distributions, like Debian, generally do not permit rpath to be set. Add a configure option that disables rpath inclusion to external libraries. Change-Id: Ieb1b16d3a154fdf9da09902dc8a27dd1be0a530e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update Russian translationSergey Belyashov2015-10-141-0/+15
| | | | | | Change-Id: I7c863c0ac12d20adcfb3107f050a9c6a3148b6ef Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update qbs submodule.v3.5.1Christian Kandeler2015-10-021-0/+0
| | | | | | | To HEAD of 1.4 branch. Change-Id: I53e4f472e04e87520fb5be0c64030090e64e8a6b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* iOS: Do not hardcode Qt version in iOS kitsEike Ziller2015-10-011-1/+18
| | | | | | | | | | | Since Qt installers nowadays (since Qt 5.3) register all Qt patch releases of the same minor version with the same ID, the Kit will not be updated (because the Qt 'is the same'), so it should use %{Qt:Version} instead of hardcoding the version. Change-Id: Ieb8b766490b3c6297fa11802c6e13724658795d5 Task-number: QTCREATORBUG-15128 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* UiCodeModelSupport: Fix crash when removing kitRobert Loehning2015-09-301-5/+5
| | | | | | Change-Id: I30c5c9f2456e911d01376b1c06f2255a95080897 Task-number: QTCREATORBUG-15120 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Git: Increase delay for mergetoolOrgad Shaneh2015-09-301-25/+29
| | | | | | | | | | On Windows it takes more than 500ms to retrieve the first line. Really wait until we have an entire line then read. Change-Id: I9f7c222c314ea977179ed549281ef145ba756c73 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Allow different destination directory than Qt Creator build directoryEike Ziller2015-09-301-14/+36
| | | | | | | | | | This is useful for compiling and packaging plugins separately from Qt Creator, where we want to keep the structure of the compilation result the same as, but separately from, the Qt Creator build directory. Change-Id: I307f119fc7901e00790ec85bfb01cc3ba5fa6e85 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Revert "Set environment variable QT_AUTO_SCREEN_SCALE_FACTOR in Qt 5.6."Thiago Macieira2015-09-291-2/+0
| | | | | | | | | | | | | | | | | This reverts commit 85e1b4d0896465b825f561330a66e5bfd3928087. Setting that environment variable breaks the UI completely for certain environments. If Qt itself doesn't enable auto scaling by default, neither should Creator (for good reason, as it apparently doesn't work yet on X11). Worse, Qt Creator must respect the environment settings set by the user, never override it. This commit was unconditionally setting the auto scaling, making it impossible for me to override the settings. Task-number: QTCREATORBUG-15115 Change-Id: I42e7ef1a481840699a8dffff140857f6c0b33713 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Git: Enable "Continue Merging" dialog on deleted conflictOrgad Shaneh2015-09-281-1/+1
| | | | | | | | When a Deleted conflict is aborted, this prompt appears too. Change-Id: I8f45363c4875b2d66bcbff93cf53b075d890ba2b Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* C++: Comment out a flaky testNikolai Kosjar2015-09-281-16/+15
| | | | | | | | | | | | | | | | | The test relied on logic that was reverted with change 915f68deac95bf17bd97d1a2644264afb0b86f0b. LookupScopePrivate::findSpecialization() gets a "TemplateNameIdTable &specializations" with a non-deterministic order. Without the extra logic, the very first entry will be chosen as the found specialization. The non-deterministic order comes from the TemplateNameId::Compare, which calls std::lexicographical_compare() with the template arguments, which are FullySpecifiedTypes. The result of FullySpecifiedType::operator<() might depend on a pointer comparison. Change-Id: I8d69d1bb5831145b1c21a5ea848c0043f17ec415 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* QMakeVersion: Fix QMakeVersion::equalsDaniel Teske2015-09-251-0/+2
| | | | | | | Broke in 8e171e0be0239c18843fc65784cb91120b252c8f just before 2.3.0 Change-Id: Ic4f4fe1d904c8a3146962e4276ae7e7bf4ed8895 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Check in initialize if OpenGl context can be createdRobert Loehning2015-09-252-3/+11
| | | | | | | Change-Id: I224c2559c1e65cfc3b699e7ec7b56dee8308bd83 Task-number: QTCREATORBUG-15101 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Welcome: Check in initialize if OpenGl context can be createdRobert Loehning2015-09-251-1/+7
| | | | | | Task-number: QTCREATORBUG-15040 Change-Id: I8c78ac0a3b979c4ec8e088cd1be3c6aeb04ff339 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Debugger: Disable CLI use of gdbbridge.pyhjk2015-09-251-5/+5
| | | | | | | | | | | | The detection seems to go wrong in some cases on RHEL which are not reproducible locally. Since the feature is not important for Qt Creator's own use, disabling is safer than attempting to guess better. Change-Id: I95fd56985d61b604a285e7573f8775b902bcc68c Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* ResourceNodes: Fix inverted check in renamePrefixDaniel Teske2015-09-241-1/+1
| | | | | | | | The inversion happened in ea2bb656cd804ed3797012da637a5c71b1a13e5a Change-Id: I999fc46be00e60b91a8790053c585e95fbcb7d17 Task-number: QTCREATORBUG-15099 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Debugger: Reduce scope of usage of Python's importlib modulehjk2015-09-241-2/+2
| | | | | | | | | | The module doesn't exist in Python 2.6, so we can't use it unconditionally if 2.6 is to be supported again. Task-number: QTCREATORBUG-15076 Change-Id: Ic91cdf451ce846d892cd914bf850a4fd4b18c488 (cherry picked from commit a7dd2ed4ce0f88eb548dfc1dbb6eb7c5d5c7fd8d) Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Changelog: Add 2 entriesOrgad Shaneh2015-09-241-0/+3
| | | | | Change-Id: I2953d3ca1dc7a3d7fe964e557c46047eaf50a179 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* CppTools: Add a test for ObjC not replacing dot with arrowOrgad Shaneh2015-09-231-0/+10
| | | | | | Task-number: QTCREATORBUG-14583 Change-Id: Icffa9039215a841e200f20b83cda37d782b94e9a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* CppTools: Support ObjC in member access operator testsOrgad Shaneh2015-09-231-3/+18
| | | | | | | Actual test is added in a follow-up commit. Change-Id: I645d1e50d4ac9d281e31a0375f64fea849bf5e25 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* Android: Fix debugger startup with recent Android SDKhjk2015-09-232-3/+27
| | | | | | | | | | | | | Android SDK Tools 24.x ship an adb that requires in the 'adb shell' command an additional level of quotes for parameters with spaces compared to previous versions. That broke the passing of the gdbserver start command and consequently debugger startup. Task-number: QTCREATORBUG-15032 Change-Id: I442355821641d4c6a632b50d1065c442736711aa Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Change logEike Ziller2015-09-231-0/+56
| | | | | Change-Id: I4d6e8f65bb278cff8d63d07e1e354d98c18e3d0e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Journald: Do not emit signals for kernel messagesTobias Hunger2015-09-221-1/+4
| | | | | | | | | | | Those have no _PID set, which we treated as 0. This is also the PID we set when an application is finished. This leads to journald messages showing up in the application output *after* the application was finished. Change-Id: I980199740a85c4e68221399eceb543affa12387f Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Alexander Görtz <alexander.goertz@tu-dortmund.de>
* Squish: Stabilize tst_cli_output_consoleRobert Loehning2015-09-211-1/+7
| | | | | | | | Skip frequently failing qDebug output from Qt 5.4.1 MinGW. Change-Id: I20d0fed184e3935484179e9509c902eb94e48ead Task-number: QTCREATORBUG-15067 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Squish: Fix tst_default_settingsRobert Loehning2015-09-212-19/+12
| | | | | Change-Id: I136d93e7b698dcda5388bc24b9bcaaae482fb861 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Doc: update info about Beautifier optionsLeena Miettinen2015-09-211-5/+6
| | | | | | | | | Uncrustify now also provides the "Format Selected Text" command. Change-Id: Ifb30fc0b0b706cc8d06d24727556d0e98b863098 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Lorenz Haas <lykurg@gmail.com>
* Analyzer: Only load a random first tool if none is selected alreadyUlf Hermann2015-09-181-1/+1
| | | | | | Change-Id: Ia0ece94a8ef8d8f86d08400594744552c7a77242 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* QmlProfiler: Load notes after timeline models are finishedUlf Hermann2015-09-171-2/+3
| | | | | | | | Otherwise the notes cannot be associated with timeline events. Change-Id: I9a2f039fddd36c9a6bbaca3c0864c75e33cc479d Task-number: QTCREATORBUG-15077 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qmljs: set cpp object to the latest version exportedMarco Benelli2015-09-171-1/+5
| | | | | | | | | m_objectsByQualifiedName did not prefer the latest meta object revision, as consequence at type exported both anonymously and with a name, would pick up one version randomly. Change-Id: I91baf2729d0a0bda61205a62d9a38d04b4da058e Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Added newer QtMultimedia version to bundle.Marco Benelli2015-09-171-0/+4
| | | | | Change-Id: I553684b6a45a7112ea630997c440237d3e40459f Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* VCS: Fix encoding for editor-related commandsOrgad Shaneh2015-09-171-0/+2
| | | | | | | | For example Git Log. Change-Id: I1d838f86dc70f000e66443eece60adc07310c8b8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* CppTools: Do not read language features from document in completerOrgad Shaneh2015-09-161-4/+0
| | | | | | | | The correct value is set on construction. The document knows *less*. Task-number: QTCREATORBUG-14583 Change-Id: I60973047e14ce0664c49e802124b51aa23444835 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* Squish: Don't check state of closed bugRobert Loehning2015-09-111-1/+1
| | | | | | | | | The bug is fixed in master so checking for it here in 3.5 is wrong and causes fails. Change-Id: Idd429cf61734c869ada2728151b2bf6f82f6a240 Task-number: QTCREATORBUG-14307 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Squish: Test warnings about outdated Qt versionRobert Loehning2015-09-111-0/+10
| | | | | Change-Id: Id5c3243ace16ef545386cc3f63744963edd5fda1 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Git: Fix compilation with GCC 4.8Orgad Shaneh2015-09-101-3/+3
| | | | | Change-Id: I47e2ac73a7afdd5c44c054bab54bc454973a1fa7 Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
* Update Russian translationSergey Belyashov2015-09-101-3778/+1355
| | | | | | Change-Id: Ib6f3b047a318528c6b6ad85b9421bc4b23555e90 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* QmlProject: Fix wrong "." level in project structureDaniel Teske2015-09-101-0/+2
| | | | | | Change-Id: I6b69a055aa2793ebf0b254ed2b54c008388cc094 Task-number: QTCREATORBUG-15044 Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
* Wizards: Respect cancel button when asking about overwriting filesEike Ziller2015-09-101-1/+1
| | | | | | Change-Id: Ica567fd53aedf074976165401b98558e75e3bb56 Task-number: QTCREATORBUG-15022 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* C++: Revert problematic template specialization changesNikolai Kosjar2015-09-104-82/+57
| | | | | | | | | | | | | | | | | | | | | | | | This mainly reverts commit 81721f678122bc66213b5f2a5fbf36c43e5e1a35 C++: Fix resolving of recursive typedef commit 2070431d8ca867acfb4391c275cd82caff4d711a C++: Fix resolving of partial specialization and some bits of other changes due to dependencies. It also reverts commit e0594fc9b906a32f5c8ac70265490cf86044676f C++: Fix expensive lookup for boost which attempted to solve the upcoming problems. Task-number: QTCREATORBUG-14741 Task-number: QTCREATORBUG-14889 Task-number: QTCREATORBUG-14962 Change-Id: I3f9e1f97199e5199b71da394fc27051c7709bd1f Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Git: Fix crashOrgad Shaneh2015-09-101-1/+1
| | | | | | | | | | An asynchronous command deletes itself when it ends. Raw pointer is a bad idea. Task-number: QTCREATORBUG-15051 Change-Id: Ie2b3a90e308a4bb1e414f924a836d816abf1dfd1 Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Squish: Avoid menu problems with Squish 6.0.0Robert Loehning2015-09-093-0/+3
| | | | | Change-Id: I43219d36f07e2b5636f84f891f94220148f4dd7f Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Fix non standard wizard for default themeDaniel Teske2015-09-081-0/+1
| | | | | | | | | | | | | Somehow a line "PreferredStyles =" is interpreted by QSettings as a QStringList with a empty string. Simply remove empty strings on reading the settings, as no style can have that name. Change-Id: If544e55f759c201d0621c71424a4ebedc8456d61 Task-number: QTCREATORBUG-15043 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
* Squish: Update READMERobert Loehning2015-09-081-6/+7
| | | | | Change-Id: Iac7dfbbd62ce03b73ca55562148d8741f52d4d1d Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* qtcreator-faq.qdoc: Remove obsolete qtc-debugging-helper.Friedemann Kleint2015-09-081-2/+0
| | | | | | Change-Id: Ife4a32d689297d58987b10cfea617760177b9ac9 Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Dist/GDB: Use multiarch gdbOrgad Shaneh2015-09-083-24/+21
| | | | | | | Instead of building gdb for each target Change-Id: I664f090919f0cfe9bf5a9cbcbe942d8d5e30a76a Reviewed-by: hjk <hjk@theqtcompany.com>
* Dist/GDB: Upgrade to 7.10Orgad Shaneh2015-09-083-3/+3
| | | | | Change-Id: I1ad88ae70634c86740812d03e3c581e68009a975 Reviewed-by: hjk <hjk@theqtcompany.com>
* RessourceEditor: Fix crash on adding prefixDaniel Teske2015-09-081-1/+1
| | | | | | Change-Id: I27624c5327891ae4ec9e045738577f48cbd824a6 Task-number: QTCREATORBUG-15034 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Wizards: Fix dark style for wizard pagesDaniel Teske2015-09-081-0/+4
| | | | | | | Change-Id: I6c0abc522e8760a6082ac623d4da8facaff4baf3 Task-number: QTCREATORBUG-13395 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Doc: fix section name in the sidebar in online docsLeena Miettinen2015-09-071-1/+1
| | | | | | | | "Debugging and Analyzing" is now "Testing", because autotests are also described in this section. Change-Id: Ied1de78d630e4e7faa39d343475b5e493b5e89c7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* VcsBaseEditor: Use TextDocument to set textTobias Hunger2015-09-071-1/+1
| | | | | | | | | That is the preferred way to do things (and also has the advantage of not triggering the crash described in QTCREATORBUG-14975;-). Task-number: QTCREATORBUG-14975 Change-Id: I5da9be45f3ec88478931d07b7a64dfd4d0ed32c0 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Doc: Correct paths for designer plugins on OS XEike Ziller2015-09-071-2/+2
| | | | | Change-Id: Ia0ebd0539513d38acd97e834465cc3ea6da90a6e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
View Lorry Controller Status