feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
30,260 Commits 108 Branches 368 Tags
c0272c7919c6edad11a49a39dfd1ce6c672a1b07
Commit Graph

104 Commits

Author SHA1 Message Date
Oswald Buddenhagen
6b8167c663 Merge remote-tracking branch 'origin/2.5' 2012-04-16 10:03:48 +02:00
Christian Stenger
88eec5ae47 Squish: Use sorted filenames also for Console 
Change-Id: I8ac973e772b3d1856e5307319c75fb4d150cf818
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-10 13:54:43 +02:00
Christian Stenger
fb85d0a0f2 Squish: Handle Update Generated Files on Mac 
Change-Id: I390ba57266ab983335a5d76d38a025b4306c5b74
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 20:05:54 +02:00
Christian Stenger
158dfffe7d Squish: Add try/except to continue anyway 
Change-Id: I24a51142988841da3aa156f6a5e6e239a6bd1914
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 19:51:59 +02:00
Eike Ziller
9ec6e9f7e0 Merge remote-tracking branch 'origin/2.5' 2012-04-05 18:24:26 +02:00
Robert Loehning
f521c9f062 Squish: Always use the same function for preparing templates 
Change-Id: I90dac33dde4c0c3d39c8e8038371dfbb3403dce3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-05 17:22:06 +02:00
Eike Ziller
c814538d95 Merge remote-tracking branch 'origin/2.5' 2012-04-04 16:20:10 +02:00
Jan Kerekes
2ece74469c Added new test cases/suite for complex project compilation 
initial commit

Change-Id: Iefa2e05b4dcd70d599bbf4c7de1ae230cd8f0450
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-04 10:28:23 +02:00
Eike Ziller
078d570721 Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	share/share.qbs

Change-Id: Ia64573d1a69b9063fee32496a3f0a00926a3dadd
 2012-04-03 10:03:52 +02:00
Christian Stenger
7e4e06796e Squish: Small fixes for runAndCloseApp() 
Change-Id: I74136202c2d5e482a18a56ea2c0ba11d9d958574
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-02 15:30:03 +02:00
Robert Loehning
042dae0e5e Squish: Waiting for enabled button 
Change-Id: If06bb6360c7837e773e2eb0b6be8143e588b771e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-30 14:55:03 +02:00
Eike Ziller
8f6d915948 Merge remote-tracking branch 'origin/2.5' 2012-03-28 16:31:29 +02:00
Christian Stenger
857261f99d Squish: Improve openQmakeProject() 
Change-Id: I847604f81d1bdb10a56360af3d0969e451b3344c
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-28 15:27:38 +02:00
Robert Loehning
79b0ff8186 Squish: Updated checking for created files 
Done-with: Christian Stenger

Change-Id: I533ff2f41a5d6554d0f6a880d1ede093de2f9d6c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-09 17:42:46 +01:00
Robert Loehning
0949e7528b Squish: String updates 
Change-Id: Ic513a4cd10460d177b0305e53a4ed55b7c75e541
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-03-08 16:04:56 +01:00
Robert Loehning
abd62116f8 Squish: Removed unneeded workaround 
Change-Id: I38fc9742fa4b26a694d8bcaddabaf0ceddb48d7c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-08 16:04:43 +01:00
Robert Loehning
3aaa3b3fa4 Squish: Fixed handling of targets 
Done-with: Christian Stenger

Change-Id: Iaa03a3df2151706bbe5d508a20f70a5007817d4d
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-29 13:28:09 +01:00
Robert Loehning
f92b8486af Squish: Working around QTCREATORBUG-7002 
Change-Id: If575398e4ea9f7dcd4b31ebdf49708f2b2dcbc15
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-28 14:35:38 +01:00
Christian Stenger
3ad7e50827 Squish: Verify targets for project creation 
Change-Id: I3af0e0cde985c4b04bd4ae8181c3b82cda22b2b8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-22 13:57:47 +01:00
Robert Loehning
d3ad49ea4d Squish: Excluding Maemo target from Qt Quick projects 
Change-Id: Ief66b17723d867711bd9eb4a9fa549e930efd7f9
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-21 13:58:25 +01:00
Christian Stenger
0f703ea068 Squish: Maemo is subset of Harmattan 
see https://bugreports.qt-project.org/browse/QTCREATORBUG-6965

Change-Id: I56852572976806ba74c95b9b40f647d217a95003
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-17 14:32:22 +01:00
Christian Stenger
5b3acc8228 Squish: Use the new 'create project' wizard 
Change-Id: I871b7abe2390e76b1e9b54c2f9809940d0ffa930
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-16 20:19:48 +01:00
Christian Stenger
e714f29326 Squish: Fix wrong object name 
Change-Id: Ie54e8407a613bcd3870f278d334643c434b9e325
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-14 15:40:34 +01:00
Robert Loehning
e75a9010b0 Squish: Updates for changed project wizards 
Change-Id: I70801de29312bb49db060d0b87fc9dcb1490c6ca
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-09 18:42:35 +01:00
Robert Loehning
354bcaa893 Squish: Updated openQmakeProject() 
Change-Id: I8594161b99c207852be290cc8212aefe6faef609
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-06 16:30:51 +01:00
Robert Loehning
7dbc6014e3 Squish: Added test for command line output 
Change-Id: I4a25f971d41acd5e349e753602d4ae3aaafb4e32
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-31 16:37:31 +01:00
Robert Loehning
2f27c73c8e Squish: Added warning about unusable targets 
Change-Id: I2796aaf40d0ffcf89aca085afdc685f57e1b4f76
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-30 17:48:56 +01:00
Robert Loehning
d2f8baad67 Squish: Fixed selection of generator for CMake project 
The generator must match the mkspec of qmake in PATH.

Change-Id: Ibd6d345c202719cdf2a8e8a5e2a5fce470732d5b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-27 17:23:48 +01:00
Robert Loehning
6b1b47d83c Squish: Let CMake build in temporary directory 
Change-Id: Ib2cc65378b74f662652434dd1a65d845ee3fb741
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-27 15:39:21 +01:00
Christian Stenger
2663f5d34e Squish: Improve cmake test 
Change-Id: If6cdae302f29cbfe50eb1355b610e8f120bf7681
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-24 12:53:05 +01:00
Christian Stenger
f64a31a09d Squish: Changed fatal to warning 
We still have a fallback and jenkins will
mark this as a problem (while it ignores warnings).

Change-Id: Ie33085c844c7ffbe1985a6b867aef00c7ae8c920
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-23 11:59:41 +01:00
Christian Stenger
14a8ad256e Squish: Make QMLViewer test stable on Jenkins 
Change-Id: I175d10e1a5c23616801ac2c9be298198c89541b2
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-23 11:58:21 +01:00
Robert Loehning
36573eda7b Squish: Running tst_build_new_project on more build configs 
Change-Id: I413f5393bb8d56842d8132e26123ebe21d89c57a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-17 16:24:23 +01:00
Robert Loehning
dac69143af Squish: Added helper function for opening files 
Change-Id: I756822299e591010eb926ee46600f4b5231d9318
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-12 12:16:04 +01:00
Robert Loehning
67644e6fc0 Squish: Added function for creating new Console Application 
Change-Id: Ia894d978ebb9b6add3e3ca55bc97054eef98214b
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-12-14 18:19:44 +01:00
Christian Stenger
fb21ad4d3c Squish: Added FindUsages test to QML test 
Change-Id: I2571bf1e87d34495dc4299f04d310f894d22e38d
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-12-13 17:10:14 +01:00
Robert Loehning
78b65c808a Squish: Small fix 
Change-Id: I3bb789950b278dd7ac829555678c126703f6cf52
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-12-13 16:28:30 +01:00
Robert Loehning
d229705d7b Squish: Checking if the right build configuration is set 
Change-Id: Ib889d1d8269a8c58edc12b688360b94a0b4bdedf
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-12-12 09:24:45 +01:00
Robert Loehning
44e4c45e64 Squish: Simplify selectFromCombo calls 
Done-with: Christian Stenger

Change-Id: Ie9b2691675b12fb4d84f9239358c7db4ab60c431
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-12-09 16:08:11 +01:00
Christian Stenger
86ba284d06 Squish: Improved and refactored hook into 
Change-Id: I05f17bbe49db7064cd6bf5131363ca0708aad087
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-12-02 15:03:18 +01:00
Robert Loehning
0a48570f6a Squish: Update for changed sorting of project wizards 
Change-Id: Ia1a5cbe1ace8e4bed0500e7c46fcff90a10cc7ae
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-25 16:01:06 +01:00
Christian Stenger
3089bd3f6c Squish: Implements hooking into the subprocess 
Change-Id: Ic1ae2a8341d01e179f9d52b7c7ad3cbe24995bd1
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-23 15:49:04 +01:00
Robert Loehning
e465a1763b Squish: Added function ensureChecked 
Change-Id: Icca18645613d0b88e4394aa5fc3820626a59e647
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-08 14:12:40 +01:00
Robert Loehning
c79d8b32b4 Squish: Some more reuse of code 
Change-Id: I3d4e7c0b9d8afc31fb5cfa2bc7879ea999129158
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-08 10:47:19 +01:00
Christian Stenger
3c350c93d8 Squish: Small refactoring - renamed helper 
Change-Id: I3ca9261043f568a9e160546998dd7b2cd5aa0dd4
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-02 09:41:53 +01:00
Robert Loehning
edad3217e6 Squish: Added function which selects template for new project 
Change-Id: I7858e60c21641e39f6a5c23a12e3fd78a9d17334
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-01 14:48:55 +01:00
Robert Loehning
08115952ea Squish: Added function handling name and location of new projects 
Change-Id: I23af07bb41b517af1ad9f65c642c3eedd0712093
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-31 17:58:06 +01:00
Robert Loehning
1139006b3f Squish: Let one function handle last page of all project wizards 
Change-Id: I74e2c2f0c50a3131ad66fbde5e4a7fe004b7ebff
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-17 18:09:25 +02:00
Robert Loehning
584a8f016e Squish: Moved remaining functions for creating projects to project.py 
Change-Id: I92b56ed9401be41d0a54dd32c623b55b7d1e4f71
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-13 14:58:04 +02:00
Robert Loehning
23436285bc Squish: Renamed "destination" to "target" 
Change-Id: I8f8a1cc4b58642fc64adfa76eea84c2b4e9f0423
Reviewed-on: http://codereview.qt-project.org/6255
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-10 15:42:17 +02:00