summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix the build: add missing #includes3.1Thiago Macieira2014-08-184-0/+4
| | | | | | | | | <QWidget> for QWidget, <QDataStream> for QDataStream and <QMetaObject> for Q_GADGET (technically, qobjectdefs.h) Change-Id: Ia7e8b12ff4c67827bb7782a0337714e330de1db1 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* pass a pointer instead of a reference to initFrom()Oswald Buddenhagen2014-06-232-11/+11
| | | | | | | | | | | msvc thinks that it's impossible to create a null reference (because some language lawyer said so) and thus complains about our assert that checks the reference's validity. work around by not dereferencing the pointers we already have. Change-Id: Ife2288d4187860105de12fdebc0e671e0159ace3 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> (cherry picked from qtbase/11161bbfadd0056466fc414ed659d08a4a0fe492)
* QbsProjectManager: Link qbsqtprofilesetup in the "external qbs" case.v3.1.2Christian Kandeler2014-06-191-5/+3
| | | | | | | We forgot to add this library there when we introduced it. Change-Id: Id7a0693235a133cd4c96bd0e582e984efa6bdab2 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Update Czech translationPavel Fric2014-06-191-199/+4197
| | | | | | Change-Id: I1531b1362628916c5f992a69254db0b47e028759 Reviewed-by: Vojtech Kral <vojtech@kral.hk> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QbsProjectManager: Do not assume "lib" directory name for external qbs.Christian Kandeler2014-06-191-4/+2
| | | | | | | | | | While it is technically not required that project.libDirName matches the external library directory name, other combinations seem quite silly. In practice, they should either both be "lib" or both be "lib64". Change-Id: Ib8ecba846787f7791a0b6bd57cdfc2df024dbb3b Task-number: QBS-627 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Fix winrtrunner device detection and deployment for WP8.1Andrew Knight2014-06-195-13/+30
| | | | | | | | | Add device detection for WP8.1, and use the Appx packaging codepath for these devices. Rely on winrtrunner to automatically select the correct profile. Change-Id: Ibd1d415644fdc8fd007969be25213410c3c0e0a7 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Debugger: Make dumper work with GDB 7.7hjk2014-06-182-83/+137
| | | | | | | | GDB 7.7 changed behavior e.g. for the names of anonymous fields, we need to adjust dumpers and some tests. Change-Id: I25ae32cc56c4ff63b677a04d6ed9c250e0252140 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fixed compilation error on RHEL 5.10.Dale Marchand2014-06-185-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nesting the namespace "Internal" inside of other namespaces and using sequential "using namespace" directives *or* relying on a "using namespace" directive to resolve a method name that contained the "Internal" namespace for resolution resulted in ambiguous resolution errors when compiling with the RHEL5.10 stock compiler (GCC 4.1.2). A sample error is provided below: Compilation error encountered was: reference to 'Internal' is ambiguous /usr/lib/gcc/x86_64-redhat- candidates are: namespace Internal { } qt-creator/src/libs/cplusplus/PPToken.h:106: error: namespace CPlusPlus::Internal { } Modifying the using namespace directives to reflect the nested nature of the namespace names resolved the compilation errors. For example: using namespace CppEditor; using namespace Internal; produced errors. However, using namespace CppEditor; using namespace CppEditor::Internal; resolved the compilation errors by removing the ambiguity. Change-Id: I6d5051e20acb2c147bd7ee1c6c6e1e3b2b4ff0f9 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Doc: checking include paths in C++ Code Model InspectorsLeena Miettinen2014-06-161-0/+5
| | | | | | Change-Id: Ia9c65df9c2e542b135f3eccb3dfdc137c03f732a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update qbs submodule.Joerg Bornemann2014-06-161-0/+0
| | | | | | | To the head of the 1.2 branch. Change-Id: I2bd0460553afa6a8fba0bf01cfa2addc06a043b5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Allow sdktool to run in an elevated contextKai Koehne2014-06-131-0/+9
| | | | | | | | | | This fixes an issue with installation on Mac: We run sdktool with 'elevated' rights if we e.g. install in a global directory, forcing the effective user id to be 0. However, since Qt 5.3.0 QCoreApplication aborts if geteuid() != getuid(). Change-Id: I678f405fc0cb31dbf9c0487f674bb8dbe5e2e95e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Doc: OTHER_FILES variableLeena Miettinen2014-06-132-0/+8
| | | | | | | Task-number: QTCREATORBUG-12054 Change-Id: I994098197514217522fe288f7e2a83e66ffd795e Sanity-Review: Qt Sanity Bot <qt_sanitybot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix crash when adding files from window menuEike Ziller2014-06-131-2/+2
| | | | | | | | | Introduced by 2ad3147542a45436733ddd7014993bcc3022a654 Task-number: QTCREATORBUG-12409 Change-Id: I422d315c5b9d22052251a0869d314adff7741af0 Sanity-Review: Qt Sanity Bot <qt_sanitybot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* C++: add test for anonymous with __attribute__Przemyslaw Gorszkowski2014-06-131-0/+1
| | | | | | | Change-Id: I1938ed1bf45523ec62f35bc3324f6553c0dafe22 Sanity-Review: Qt Sanity Bot <qt_sanitybot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* QmakeNodes::addNewInformation: Be responsible subfolder nodesDaniel Teske2014-06-121-2/+2
| | | | | | | | | | | | | | | | And increase the priority for those too. Fixes the case: a.pro b.pri test c.pri Right click on test and add new file. In that case b.pri should be the node to which the file is added. Task-number: QTCREATORBUG-12272 Change-Id: I54d144861bc06545db8e71ed33513a0df971dae2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* packaging: fix qt.conf for ios toolsFawzi Mohamed2014-06-121-3/+0
| | | | | | | | | | | | Qt 5.3.1 does not set the profix only based on the use of QGuiApplication but actually checks if the app is a bundle, so the Prefix hack in the qt.conf for the ios tools is not needed anymore. Task-number: QTCREATORBUG-12393 Change-Id: I6a228d83370bc62929ffd056b9b3051e4562485e Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Add changes fileEike Ziller2014-06-121-0/+52
| | | | | Change-Id: If5e742f658602e5254a9350902342f8452934674 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Update qbs submodule.Joerg Bornemann2014-06-111-0/+0
| | | | | | | To the head of the 1.2 branch. Change-Id: I3646c499af05fc0488d6e712b99b9a53636ca935 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QMake: Fix missing qrc files in locator/search/...Eike Ziller2014-06-061-0/+4
| | | | | | | | The QMake project didn't put them into files() anymore since qrc nodes where made folders. Change-Id: I8e9354699cfccc4fdd4f5ce39baa30a9d61ce051 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* CodePaster: Do not crash in case of invalid default protocolEike Ziller2014-06-061-0/+4
| | | | | | Task-number: QTCREATORBUG-12364 Change-Id: I6e9bf75dd6b8df187a6802e9d90c3d986cc86a5c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* C++: fix nested anonymous with __attribute__Przemyslaw Gorszkowski2014-06-063-6/+58
| | | | | | | Task-number: QTCREATORBUG-12345 Change-Id: Ib2316ebdc81393b38185b9cb659fb85b78753e7b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Help: Fix filtering in topic chooserEike Ziller2014-06-051-0/+1
| | | | | | | Probably broke with a74de6af81b659ef0dcbbbe25f94d9b527c2be98 Change-Id: I6df2b7ae88d6bd337cd110d6788dbb68ca73eb16 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Squish: Fix getEditorForFileSuffix() and simpleFileName()...Christian Stenger2014-06-044-6/+14
| | | | | | | ...when using filenames coming from Squish's treeview syntax. Change-Id: I0296dbabb09af11dde5ed4716b1b1f48f05c47e1 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Squish: Let tst_HELP04 run on Qt 5.3Robert Loehning2014-06-042-6/+7
| | | | | Change-Id: I41a3121e616e5709f10e8d03da2fb71356d06498 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Fix up version bumpEike Ziller2014-06-041-1/+1
| | | | Change-Id: I00671d20c3adc7aebcc5e1a984e4c0475195ba74
* Fix setting DocumentManager::currentFile when clicking into splitEike Ziller2014-06-043-19/+5
| | | | | | | | | | | | This broke when introducing delayed setting of the currentEditor when the context changes. Simply move the logic from the document manager to the editor manager, where it arguably belongs to anyway, and also set the currentFile delayed in that case. Task-number: QTCREATORBUG-12264 Change-Id: I67ee3f9a02e62cfa67671629c956a4290361cba8 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Squish: Stabilize tests using getEditorForFileSuffix()Christian Stenger2014-06-032-3/+4
| | | | | | | | This is especially useful when switching between files assigned to the same type of editor. (e.g. cpp header <-> cpp source) Change-Id: I0179e7086a6f25cb0ecc0b69da1f61adb21d8ac2 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Version bumpEike Ziller2014-06-032-3/+3
| | | | Change-Id: If27d07243cb96a35b8ada5f3137c0edc61d60fc5
* Prevent flicker on MiniProjectTargetSelector showMorten Johan Sørvig2014-06-031-7/+5
| | | | | | | | | | Reproducible on Mac OS X. Set position before changing the visible state. Change-Id: I8a7e73dae94ceb865ea8a7ef4cec4112220888de Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Squish: Avoid pointless waiting and warning in selectBuildConfig()Robert Loehning2014-06-031-2/+2
| | | | | Change-Id: Ia092d7e7f9af78c23512fa193635ff52fead822d Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* ResourceNode: Fix matching on '/' nodeDaniel Teske2014-06-031-1/+1
| | | | | | | | A ResourceTopLevelNode should only prioritize it's own child '/' node. Task-number: QTCREATORBUG-12297 Change-Id: Ia9834d7111622d4558e1a2c21b602b11ff5db139 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Core: Fix locator file filter test.David Schulz2014-06-031-3/+3
| | | | | | | Use forward slashes as separator in the test data. Change-Id: Ib832f0c72dc1694b2b2e230e32a274b96956c44b Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Use dumpIndices()Robert Loehning2014-06-021-2/+1
| | | | | Change-Id: Iecfaec20c54014b361268947145f80409103388e Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Add test for generic highlighter and MIME typesChristian Stenger2014-06-022-1/+221
| | | | | | | Task-number: QTCREATORBUG-12097 Task-number: QTCREATORBUG-12149 Change-Id: Iebb5711c437415bcbb2b3bae72aaa7bc98c34905 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* avoid that a bad qmakespec path crashes the evaluatorOswald Buddenhagen2014-06-021-4/+10
| | | | | | | | | | assigning a relative path to QMAKESPEC or QMAKESPEC_ORIGINAL (in the qt4 windows legacy code) would lead to an assert further down the line. just ignore such attempts silently. Task-number: QTCREATORBUG-8477 Change-Id: Ie53d0ef004c743284b85de4e89f112e0161ff4b7 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Fix matching of partial paths on WindowsAndreas Pakulat2014-06-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | The paths against which the match is done always have forward slashes (i.e. uniform separator on all platforms). However the needle passed in has backward slashes on Windows usually, since this is how the paths are shown to the users and what is natural on windows too. Even explicitly using forward slash in the needle does not work here, since then the needle is not detected as containing a path (hasPathSeparator is false since it uses the native separator). Since it seems that the code internally favors the 'uniform' separators using slashes, simply convert the needle from native to uniform separators and use the forward slash to decide whether the needle has a path in it. Side effect of this is that it is now possible to use forward slashes when typing into the locator UI on windows. The opposite does not work on Unix though. That could be considered a feature though for cross-platform developers. Task-number: QTCREATORBUG-12007 Change-Id: I5064bd9c60936466dd04671ef42a578df26ea7b8 Reviewed-by: David Schulz <david.schulz@digia.com>
* Help: Fix that context help does not end up with focusEike Ziller2014-05-301-0/+2
| | | | | | | | | | When opening a help url with anchor for context help, the help viewer would loose focus, breaking behavior like pressing F1 twice to go to help mode. Task-number: QTCREATORBUG-9093 Change-Id: Ib6b6ecb4f6bec63f545c1f4ff973d878547f3ee1 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Debugger: Limit QObject name dumper to a more-than reasonable maximumhjk2014-05-301-1/+3
| | | | | | | | | GDB can crash on to big chunks. Since this here is a convenience feature only, hard-limiting it to length 200 seems ok as work-around. Task-number: QTCREATORBUG-12330 Change-Id: Ia6ebf16f3528d91020d19851641f42c1e421fe15 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Update qbs submodule.Christian Kandeler2014-05-281-0/+0
| | | | | | | To the head of the 1.2 branch. Change-Id: I077f4db839ae74a21895eac8cc470525418ae773 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* More robust saving of output pane button visibility setting.Eike Ziller2014-05-282-8/+14
| | | | | | | | Explicitly manage visibility state instead of relying on QWidget::isVisible which might lead to problems at shutdown. Change-Id: Ic0c2f4e4f83c4241aea2ad28e533f5148cc4606e Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Squish: Stabilize tst_APTW03Robert Loehning2014-05-271-0/+1
| | | | | Change-Id: I301c47ca3f09d0f88ceaf7908d35d071c2d73ce5 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Add another test for DesignerChristian Stenger2014-05-273-1/+195
| | | | | Change-Id: I13d71579cf371b2345b16d932b41d9e8ccae0ee0 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* fix building against non-installed qt5 shadow buildsOswald Buddenhagen2014-05-272-18/+20
| | | | | | | | | | | | | the global qdoc configs may live in the source dir, but the indexes are always in the build dir. this will obviously only work for a non-prefix (developer) build of qt, as a non-installed prefix build is not usable from the outside. Task-number: QTCREATORBUG-11919 Change-Id: I268af2f075a098ac5fe788a2f85c754dc6e4e8b0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Beautifier: create temporary file in input file dirPrzemyslaw Gorszkowski2014-05-261-1/+2
| | | | | | | | | It fixes finding .clang-format file for "clang-format -style=file" Task-number: QTCREATORBUG-12057 Change-Id: Idd02de1535eef30e1a1eaf146ef0f9ac9d54c5fa Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Git: Fix tab order in gerrit optionsOrgad Shaneh2014-05-261-0/+1
| | | | | Change-Id: I6169b97ebbc412e41cf42d3c4d87d0b9c8ddd93e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Squish: Update Creator's sources to v3.1.0Robert Loehning2014-05-263-3501/+8480
| | | | | Change-Id: If00f643c9080262121ed582fb428e27cc709e421 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Replacing some usages of len()Robert Loehning2014-05-233-11/+13
| | | | | Change-Id: Icaf029043fed149bff6e15861fdcc6d640a2ecfc Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Add test for tasks handlingChristian Stenger2014-05-232-1/+156
| | | | | Change-Id: Ib45ac05c3aed4659e0777725e46a7a8c5dacc19e Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Squish: Test project tree of CMake projectRobert Loehning2014-05-222-0/+101
| | | | | Change-Id: I91fb9cea7cad22f9c7d3874be95ecdc42f18b358 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Fix regexes in tst_openqt_creatorRobert Loehning2014-05-221-2/+2
| | | | | Change-Id: I6117291866f7b25f6749e533d9adecfc66842711 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
View Lorry Controller Status