aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix default mkspec resolution for qt5v2.6.0tqtc/v2.6.0Oswald Buddenhagen2012-11-061-19/+32
| | | | | | | | | there are no symlinks/forwarding specs any more, but a qmake property. Change-Id: I245a074b91330b740365aec2ecc5b4432f5f756a Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* rewrite default spec handlingOswald Buddenhagen2012-11-061-2/+10
| | | | | | | | | | | instead of symlinking (on unix) or creating a forwarding spec (on windows), just put the default specs into (the bootstrapped) QLibraryInfo. Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f (cherry picked from qttools/0e75115e557b4cf1c737e3e5524f876a6b85a39e) (cherry picked from qttools/769fa282ac8a4b98698dada6969452363e0eb415) Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* resolve only one level of symlinks, and only for the default specsOswald Buddenhagen2012-11-062-3/+10
| | | | | | | | | | | otherwise we end up in the source tree, which is counterproductive. Task-number: QTBUG-26869 Change-Id: Id44a94f827dc285c75b9b243c8ef6478e668e3ff Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qttools/29bdcb6008a58203efc62ee58e57d266e60be095, plus creator-specific amend) Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* unbreak default spec resolution under macxOswald Buddenhagen2012-11-061-4/+4
| | | | | | | | when the spec is not xcode-based, we need to treat it as a regular unix, i.e., resolve the symlink. Change-Id: I155f4337dc0007261fc316876c4d6999e10f8ea6 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* fold m_qmakespecFull back into m_qmakespecOswald Buddenhagen2012-11-063-10/+9
| | | | | | | | | the original value is not used any more after the final resolution. Change-Id: Icadc219f045a1bbfd20506c4c72c53d1fb352969 (cherry picked from qttools/74d548c89dae83b392953f505876d8d383a72ce5, plus creator-specific amend) Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* fetch all properties from qmakeOswald Buddenhagen2012-11-061-2/+1
| | | | | | | | | | | | | | don't filter out ^QMAKE_.*: - QMAKE_MKSPECS is not printed any more, so needs no filtering - QMAKE_VERSION can be simply used now, as we are now rather close to the real qmake - QMAKE_SPEC and QMAKE_XSPEC need to be fetched - this fixes the default spec resolution Change-Id: Ifcfa8b5b9e2bbf5d995940e1bb7f55e7d67aed3e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qttools/0037bef09ca77c5ae4d20bd09294ba1d57537e09) Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Squish: Removed pointless explicit timeoutsRobert Loehning2012-11-059-52/+52
| | | | | Change-Id: I21e41fc8d1c26186afe0d18613c764abd065227e Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Qt5: Correct usage of testlib.Nikolai Kosjar2012-11-056-9/+5
| | | | | | | | This corrects commit 112f80. $$QTESTLIB is not needed since both Qt4 and Qt5 support "QT += testlib". Change-Id: I776b44825295c86d2d85e9b8dc6a422da6f36ab6 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Added test case for deleting files outside of editorRobert Loehning2012-11-054-1/+62
| | | | | Change-Id: Ib9724e0794dab7e4b2de39e72d671c8bf8f27b08 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Qt5: Fix crash in generate-ast.Nikolai Kosjar2012-11-051-2/+11
| | | | | Change-Id: Ib3a6662e8ba374f46a1d9bf7056bf44a704879b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Qt5: Compile fix for generate-ast.Nikolai Kosjar2012-11-052-11/+5
| | | | | | | | 1. Earlier refactoring did not adapt usages here. 2. Compile with Qt5. Change-Id: Ic461f2acb03d51e9ad903c4aa65b7d9e6d80fe86 Reviewed-by: hjk <qthjk@ovi.com>
* Version bump.Eike Ziller2012-11-052-3/+3
| | | | Change-Id: I978a6d435c53276a0f7a024e534278aa5f794ebb
* fakevim: Fix crash when adding text to last lineLukas Holecek2012-11-021-5/+30
| | | | | | | | | Workaround for crash when in edit block and adding text to the last empty line. Change-Id: I46b84074bd6f6fbcae698671716e151ebab98f5b Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* CDB: Quote executable in debugger launch.Friedemann Kleint2012-11-021-1/+3
| | | | | | Task-number: QTCREATORBUG-8125 Change-Id: Iaed1a7a4d68c50f8f06dc6be4b9a73933e835988 Reviewed-by: hjk <qthjk@ovi.com>
* Squish: Test for reverting unsaved changesChristian Stenger2012-11-012-1/+115
| | | | | Change-Id: I54398b5b576b9b715e473861e287546afdb4f32a Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Squish: Test handling of read only filesChristian Stenger2012-11-017-7/+177
| | | | | Change-Id: I459fdaed7338f5343b760da47e9652baf78986f0 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Squish: Update README fileChristian Stenger2012-11-011-2/+33
| | | | | Change-Id: I12761ec48af3a05d83dcaffe66b7e413d2fd4937 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Doc: replace shortcut to File Naming options with menu pathLeena Miettinen2012-10-311-1/+2
| | | | | | | The shortcut seems to have been removed. Change-Id: I1322feb44fb4b62d30c256e53ab056b5210a4ad0 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Fix crashes while parsing template parameters in C++ codePrzemyslaw Gorszkowski2012-10-311-1/+1
| | | | | | | | | | | AlreadyConsideredClassContainer has to be cleared when there is no base class Task-number: QTCREATORBUG-8128 Change-Id: Iad82f2efc361aeb38c88a751c86aa572d373557a Reviewed-by: Cristian Tibirna <tibirna@kde.org> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Update Polish translationsPrzemyslaw Gorszkowski2012-10-301-16/+14
| | | | | | Change-Id: Ia8fcaf526c2f57f86074299cfadf5a3c4c0f00c1 Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* The QtDeclarative QML viewer is found in QtDeclarative's bindirThiago Macieira2012-10-301-1/+3
| | | | | Change-Id: I1de94013c0354fbd6c03bed56e91f79925923a64 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Squish: Updated function pickVersion474runVerify()Robert Loehning2012-10-303-11/+9
| | | | | Change-Id: I02733645a6367429ce97007cfa4b882534786d78 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Updated iterateBuildConfigs() to handle multiple kitsRobert Loehning2012-10-309-42/+45
| | | | | Change-Id: I724e45bf510015dbdae6cb4c6cb55285167dafbc Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Removed unused functionsRobert Loehning2012-10-291-32/+0
| | | | | Change-Id: Idf66788a8f693d836fafe26f3355a96395066c37 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Try to watch local variable in watchwindow-DND, too.Friedemann Kleint2012-10-294-7/+15
| | | | | | | | | | Fix codepath overlooked in 6886e485de59bc1fe1fe84ca6c1fb1263b18420b by introducing a WatchHandler::watchVariable(). Task-number: QTCREATORBUG-8120 Change-Id: Ibab2619754e0006f3c81810a6bfdf758261c169e Reviewed-by: hjk <qthjk@ovi.com>
* Squish: Closing file after readingRobert Loehning2012-10-291-1/+3
| | | | | Change-Id: I69f53c7626bbdb14874d0e5d459fa0ac346d40a0 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Application templates: remove Symbian remnants from deployment.priTopi Reinio2012-10-261-2/+0
| | | | | | | | Removes TARGET.EPOCHEAPSIZE and TARGET.CAPABILITY definitions (both are specific to Symbian platform and now obsolete). Change-Id: I5d1f00717c5284945551cc2472af67e0d80b736a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Qt5: QUrl doesn't accept paths without leading slash anymoreEike Ziller2012-10-261-3/+3
| | | | | | | | Fixes e.g. opening help from the Locator help index filter Change-Id: I3f7dae08aa83c36119a31d97232b9cdba0ba89fc Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* QmlApplicationViewer: properly resolve install pathsTopi Reinio2012-10-261-3/+5
| | | | | | | | | | | | | | | | | | | | This change makes QmlApplicationViewer applications find their qml resources also in non-installed builds, regardless of the current working directory. On non-unix platforms applicationDirPath() is not used at all, and on unix, it's used only for searching applicationDirPath/../path, which is valid only after install. In-source or shadow-built apps find their qml resources only if working directory == application (executable) directory. Path may refer to subdirectory in application directory. On windows, non-installed application binary can also reside in /Release or /Debug, so its resources need to be searched under parent directory as well. Change-Id: I81f602406787c20830c656fd5dffd11aa9b4afba Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix loading of .user files from Qt Creator 2.4Tobias Hunger2012-10-261-5/+40
| | | | | | | | | | | | | We do not support loading of files more than 1 minor version old, but since the current Qt SDK still is based on Creator 2.4 we are having an exception here. Fix debugger setup while at it. Change-Id: I8f974ecd749b46868443de1a6b1e334f33734609 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Squish: Added helper functions for views and modelsRobert Loehning2012-10-2511-46/+41
| | | | | Change-Id: Ic5dc4a5fe11ec5f693ef9f5ddf3abbefd689fd99 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Qnx: Qt logs should now use default slog2 buffermfekari2012-10-251-0/+2
| | | | | | Change-Id: Iae46101b45ee366f2d6c382d1d34f9af4a16809d Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* s/RemoteLinux/ProjectExplorer in commentsOrgad Shaneh2012-10-253-4/+4
| | | | | Change-Id: Ic17525603cd100fa2014d92ed8203e91ea11713d Reviewed-by: hjk <qthjk@ovi.com>
* Editor: Fix crash on navigate backDavid Schulz2012-10-241-4/+6
| | | | | | | | Task-number: QTCREATORBUG-8080 Change-Id: I782fbdda6b2ec46b7b8f4f3e84855b99d1847e7d Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Android: Prevent deadlockOrgad Shaneh2012-10-241-10/+13
| | | | | | | | when emulator is closed before deployment is done Change-Id: I706f4c903dc229cffe2caef94f9e8cf89610ba4a Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qtcreator.qbp renamed to qtcreator.qbsJoerg Bornemann2012-10-241-0/+0
| | | | | | | The .qbp file extension is deprecated. Change-Id: I8729b7a4a35ffe0359d9eb81354dbe8b7fcfce6d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Qt5: Fix warning "qtestlib is deprecated".Nikolai Kosjar2012-10-246-9/+16
| | | | | | | | "Project WARNING: CONFIG+=qtestlib is deprecated. Use QT+=testlib instead." Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Fix crashes when cyclic inheritancePrzemyslaw Gorszkowski2012-10-242-1/+48
| | | | | | | | | | More complex situation. Base class is a template and derived class is a template. Task-number: QTCREATORBUG-8072 Task-number: QTCREATORBUG-7962 Change-Id: I7e8aa727fccd2bd4a779e6fe781553cd12196682 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Attach to Process: Fix crashOrgad Shaneh2012-10-241-2/+6
| | | | | | | When a non-desktop kit has no device Change-Id: I108f3f65d151183be1d40d659dc331e9bc57c48e Reviewed-by: hjk <qthjk@ovi.com>
* Ignoring Python byte codeRobert Loehning2012-10-241-0/+3
| | | | | | Change-Id: Ifa2c7481f1bf2863cf237ec905f4186f0b6bb0dd Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Russian translation updateSergey Belyashov2012-10-231-4283/+6144
| | | | | | Change-Id: Id68bcd0c83842cb72503f2d8335df1b3a76b068c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Squish: Added tool to convert objects.map into tsvRobert Loehning2012-10-233-20/+94
| | | | | Change-Id: Icd86b82d55f0c994c80be04fc0006d577d11d2de Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Appwizard test: Fix compilation and warningsAlessandro Portale2012-10-232-2/+5
| | | | | Change-Id: I6ec16d21c2c8554637361a48deddc71ebb52e7ce Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* C++: Fix crashes in tests with Qt5.Nikolai Kosjar2012-10-232-2/+2
| | | | | | | | | | tst_Semantic and tst_CodeFormatter crash with QTEST_APPLESS_MAIN since they need to access some font settings via QTextDocument / Q*Application. Use QTEST_MAIN instead. Change-Id: Id85228acb6006cfaee41c634c6a32b6c23a70105 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* compile fixThomas Hartmann2012-10-231-0/+1
| | | | | Change-Id: Ic854161a3104349656fbb3035daeb4adb4e79ba9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Doc: Making the header consistent with Qt reference documentation.Jerome Pasion2012-10-231-2/+1
| | | | | Change-Id: I2272f577b707ffd2f308924ba01b768c81decaa8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Style: Fix sunken style for menuOrgad Shaneh2012-10-231-1/+1
| | | | | Change-Id: I08aa20b6569cac814c479766842ff9422d1eb157 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Remove dependencies on Plastique and CleanlooksThomas Hartmann2012-10-232-34/+28
| | | | | | | | | | | | | We want to move these styles out of the library so we should not depend on them in creator. This patch reverts 63cacc4534eff5ee52fdf626b2c4e4ab60ad204f, since it does not rely on ifdefs. See also 5d0f7d2304e4b9e1d28f874f3a459b3880c7f7a3 in master. Change-Id: I8a3762f9bc31c679067ebb0a6b5540bc18e8b836 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* QmlDesigner: Compile with Qt 5 after removal of old styles.Friedemann Kleint2012-10-231-5/+10
| | | | | Change-Id: I869da5a9af76fce01f411e608f95ecbd7ddda71a Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Squish: Fix typeLines()Christian Stenger2012-10-231-1/+1
| | | | | Change-Id: I13abcceebc3f61b508da658d5e9d4650fddff6ea Reviewed-by: Robert Loehning <robert.loehning@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 13:17:23 +0000