aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Rewrite to show $(QTDIR) environment or errors immediatelyKarsten Heimrich2016-11-222-95/+47
| | | | | | | | | No need to delay the error message, remove the timer. Also show an error message if the user tries to use $(QTDIR) but we can't find it in the environment, propably a VS restart should fix it. Change-Id: Ie25b2588fd9c0d30d47ee384e3db4672ba103601 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix: Environment variables are not saved/restored after VS restartKarsten Heimrich2016-11-182-9/+28
| | | | | | Task-number: QTVSADDINBUG-407 Change-Id: I6a93b2eff62abb6c7f16b5eb8147a9541d0fdd3d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge remote-tracking branch 'origin/2.0' into devAlex Blasche2016-11-1610-34/+182
|\ | | | | | | Change-Id: Ibf35fe4e76389edb8e2a4cd150de6a5512d38107
| * Implement conditional configuration includes2.0Karsten Heimrich2016-11-149-31/+182
| | | | | | | | | | | | | | | | | | | | | | Since the VS Gallery expects each VSIX having a different GUID, we need to have a separate .vsixmanifest file per VS version. Put the configuration stuff in a dedicated directory, split the AfterBuild from the actual .csproj and have a .targets file and .vsixmanifest per Visual Studio version. Update the README file. Change-Id: I32ffee1c40345812b7f2232987e4e7a5b20c3da6 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Fix build with VS 2013, the file does not exist and is not neededKarsten Heimrich2016-11-091-3/+0
| | | | | | | | | | Change-Id: Ia20ab7b3b6c1730508b84efa6b3c04a066075eca Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Use https and show message if no file was foundKarsten Heimrich2016-11-151-2/+12
| | | | | | | | | | | | Change-Id: Ib47d7dc4af7e6ee7907d4592293c416cb0f1c282 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Cleanup the Windows Form Designer generated code regionKarsten Heimrich2016-11-152-20/+16
| | | | | | | | | | | | | | | | Set the TAB order in the designer, also the border style. Keep the delegates outside of the generated code. Change-Id: I33bd0d1d6b4061013ec8e1c5556485fc946baa4f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Remove repeated 'Module' word in function callKarsten Heimrich2016-11-149-10/+10
| | | | | | | | | | Change-Id: I822faf9a0c3132e1f11945be8a98c7ce499c819a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Fix expression will always be trueKarsten Heimrich2016-11-148-25/+11
| | | | | | | | | | Change-Id: I4a70375ba64c1c43629bf7bb55180d3dba773c12 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Fix virtual member call in constructorKarsten Heimrich2016-11-148-15/+57
| | | | | | | | | | Change-Id: I8a62e0dfb1376eadbd77f10a75101ba11c7105dc Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Code change: Rewrite to use property syntax, remove unused codeKarsten Heimrich2016-11-144-126/+52
| | | | | | | | | | Change-Id: I3f0b5a8676dc1463014c460ab4455cd1ad188e9d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Code change: Use property syntax where possibleKarsten Heimrich2016-11-144-78/+12
| | | | | | | | | | Change-Id: I533817d5b533fa03bdd63f1826d3116b16a5e638 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Remove unused function and code that could never be reachedKarsten Heimrich2016-11-141-14/+0
| | | | | | | | | | Change-Id: I1781a7bd28e3dada309852f029dfe2de9d781571 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Compress code with some useful Linq constructsKarsten Heimrich2016-11-141-38/+10
| | | | | | | | | | Change-Id: I2e2b015bd4b2df499eae23ba1e003576f6e40e29 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Refactor function and remove duplicated codeKarsten Heimrich2016-11-142-32/+8
| | | | | | | | | | Change-Id: I51fec66240738e1e674cea9fed357b32c4cba563 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Fix expression will always be falseKarsten Heimrich2016-11-145-11/+2
| | | | | | | | | | Change-Id: I73a48a71d5e1769f62d7a9d4f6bbcfdf123176ad Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Code change: Remove superfluous method and value checkKarsten Heimrich2016-11-141-13/+4
| | | | | | | | | | Change-Id: I1abff052ae5caabf62afe20712c76eb16506f943 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Code change: Comment unused types and modulesKarsten Heimrich2016-11-142-5/+5
| | | | | | | | | | Change-Id: I3f18fb0ae7368128c5aac6deb46eb92bc57ae0aa Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Code change: Remove dead or unused code, classesKarsten Heimrich2016-11-0932-1137/+1
| | | | | | | | | | Change-Id: Ibf0ac42cf92a85af50c4b964f0c6c069a42c968c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Style change: Remove all hand-added #region/ #endregionKarsten Heimrich2016-11-099-66/+0
| | | | | | | | | | Change-Id: Ib13b3a38cafbb471aaf4a0985adacd2d904aebdc Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Refactor: Move types into matching filesKarsten Heimrich2016-11-0983-1159/+2493
| | | | | | | | | | Change-Id: I8849439d4dfc1e1d60ffa889088acf5702a4876e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Style change: Second round, use implicitly typed local variablesKarsten Heimrich2016-11-0817-74/+73
| | | | | | | | | | Change-Id: Ie324716e13eb53f376a4369f106dba796a07dc62 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Code change: Remove redundant codeKarsten Heimrich2016-11-0845-352/+353
| | | | | | | | | | Change-Id: I3dabe7259a843e15fc232b8f584a8b68e50c96d3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Style change: Remove redundant braces, add missing bracesKarsten Heimrich2016-11-0817-248/+230
| | | | | | | | | | Change-Id: I5aa188b69e677e952a53ed8d85ccaddbe63a78f1 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Style change: Use implicitly typed local variablesKarsten Heimrich2016-11-0240-375/+370
| | | | | | | | | | Change-Id: I7d0c841c3c4dd6e7febfccb90032a4b88005eca1 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Style change: Use string.Empty where possibleKarsten Heimrich2016-11-0220-54/+54
| | | | | | | | | | Change-Id: I4cc855da83e549d7f1c654aa9c96cf1ed8db6409 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Behavior change: Helper tools are expected at the root pathKarsten Heimrich2016-11-021-13/+3
| | | | | | | | | | Change-Id: Ie1ff3225a84d825e04ef615f15ce9ea05417db6c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Code change: Minor simplification to string handlingKarsten Heimrich2016-11-024-15/+8
| | | | | | | | | | Change-Id: I9f6dc20636cc1cb026c863264ccf2cc9d3c673c9 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/2.0' into devJoerg Bornemann2016-10-3125-530/+205
|\| | | | | | | Change-Id: I37a0773c0867ad6bc135f5e4156e352bdaedb99e
| * Fix project import from .pro fileKarsten Heimrich2016-10-132-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | The mkspecs\\default directory does not exist anymore in never versions of Qt and we could not extract and replace the Qt path with the QTDIR environment variable. Relative paths are now replaced under the assumption that the project is on the same drive as the Qt version we do the import with. Fixes subsequent switches between Qt versions e.g. from x86 to x64 etc... Change-Id: I1a86ae3522535ae31cf47ee76fbc8f4aba8c6e4b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Use book style for dialog titlesKarsten Heimrich2016-10-122-4/+4
| | | | | | | | | | Change-Id: If31586d97aabe047fd66e5b6bee9d385ba4beaca Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * qtprojectlib: Rename resource key to reflect name changeKarsten Heimrich2016-10-125-16/+14
| | | | | | | | | | Change-Id: Ie1e0d32103672ce500c9794d594ef32174f5d2b3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * qtvstools: Add missing resource stringsKarsten Heimrich2016-10-122-2/+11
| | | | | | | | | | | | Change-Id: If97669decf654c08197d637619b64fbb1ebf624b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * qtprojectlib: Remove not existing Resource stringsKarsten Heimrich2016-10-121-18/+0
| | | | | | | | | | Change-Id: Ida360b919fec926c8bbe2a131c6675a0607f9dc4 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * qtprojectlib: Edit text that is visible to usersLeena Miettinen2016-10-111-36/+36
| | | | | | | | | | Change-Id: I3a6be1f09faacaeca7b70d17df9d30c55e169ce5 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * qtvstools: Remove not existing Resource strings, reuse existingKarsten Heimrich2016-10-113-343/+3
| | | | | | | | | | | | Change-Id: I4b49610ca10d78a6bab2784a9e07f839814c88b0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * qtvstools: Edit strings that are visible to usersLeena Miettinen2016-10-111-72/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | - Follow Visual Studio style for capitalizing UI text - Edit for grammar and style - Use the product name "Qt VS Tools" - Do not use punctuation in the end of tooltips (to follow VS style) - Use full stops instead of exclamation marks in the end of messages - Use "cannot" instead of "could not", "couldn't" or "unable to" for consistency Change-Id: I3c4793436a362be1bad1102dcba9dbabaadcf2c9 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * Fix UI text capitalization and punctuationLeena Miettinen2016-10-117-46/+46
| | | | | | | | | | | | | | | | Follow the conventions used in Visual Studio also in Qt VS Tools UI text. Change-Id: I0ec1ef66ac21a562c2681d1a0c599906ec9928ed Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * Fix building documentation with either static or dynamic QtKarsten Heimrich2016-10-104-0/+11
| | | | | | | | | | Change-Id: I4c66d4cd1293dc3614f24c9e360277764f72bf8d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Update Qt VS Tools docs to version 2.0Leena Miettinen2016-09-224-39/+3
| | | | | | | | | | | | | | | | | | | | | | The docs were removed in a previous commit, so this commit uses the standard doc file structure for Qt tools docs and updates all screen shots. Change-Id: I41193c18895ccab22ff66ef090668f161ead16fa Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix some broken resource stringsKarsten Heimrich2016-09-222-2/+5
| | | | | | | | | | Change-Id: I99197c66040dfd9ca635e32326f52e433c401e63 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Print message if the environment overwrites QMAKESPECKarsten Heimrich2016-09-133-11/+28
| | | | | | | | | | | | | | | | | | | | If for example the environment sets QMAKESPEC to an invalid directory, importing a Qt project from .pro file might fail, even though a valid Qt version is set. Print the message that makes the behavior more visible to the user. Change-Id: I96122b3dafb2d98d372c40b312622c12b43b6c82 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Fix crash while switching the projects Qt versionKarsten Heimrich2016-09-132-1/+12
| | | | | | | | | | | | | | | | | | | | | | The 'OK' button could be pressed several times in a row leading to successive executions of DTE.Solution.SolutionBuild.Clean resulting in an COMException, taking down the whole Visual Studion application. Exception message: "Cannot perform this action, a Build, Debug, Deploy, Run, or Clean action is in progress." Change-Id: I5931af74543c10f1a6f720871de6127712527629 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Fix %40QMAKE_SUBSYSTEM_SUFFIX%40 issue while switching QT versionsKarsten Heimrich2016-09-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | qt/qtbase commit 10a0ac759e26e27751ae96d02eb1e260ab371194 introduced the @QMAKE_SUBSYSTEM_SUFFIX@ which get's resolved by some .prf file magic to support Windows XP as target. Since we simply parse the file without replacing any value, the above gets added to the linker options and subsequent builds will then fail. Replace @QMAKE_SUBSYSTEM_SUFFIX@ with an empty string like the .prf does when the target is not Win XP. Change-Id: I4f4e4c9bfe3c4c652e7661a0b41413d133fc39bb Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/2.0' into devSimon Hausmann2016-09-1228-24/+1843
|\| | | | | | | Change-Id: I9f89ec35827701e9b7ec0d8517d68925d36bfd75
| * Fix opening Project settings dialog without Qt versionKarsten Heimrich2016-09-092-1/+3
| | | | | | | | | | | | | | | | If no Qt version is set and no default version is available, opening the dialog throws an exception. Handle this gracefully. Change-Id: If43425782150e438625ee03fcee631cdf3a2abfc Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Fix import of qmake based projectKarsten Heimrich2016-09-091-0/+1
| | | | | | | | | | | | | | | | The QTDIR variable was not written to the *.vcxproj.user file after creating the project, we need to call SetQtEnvironment(). Change-Id: Ib0a8be51a00bbfca72a9698cc9d07cdf270a3a27 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * QML classifier: Add settings option to enable/disable classifierKarsten Heimrich2016-09-095-2/+71
| | | | | | | | | | Change-Id: I9cbfeb4b0a75468858c09a81f1b1d936ee105a46 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * QML classifier: Put QML in front of the display nameKarsten Heimrich2016-09-091-7/+7
| | | | | | | | | | | | | | | | Doing so groups the settings inside the Tools|Options|Fonts and Settings Dialog. Change-Id: I6272621faa18c75903019ff1b82aa2f4ad3c4a67 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * QML classifier: Simplify and merge common codeKarsten Heimrich2016-09-091-60/+21
| | | | | | | | | | Change-Id: Idb8f98ee0f8c51cbcd6d180e27be96dc4be3715a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 01:26:31 +0000