feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,523 Commits 108 Branches 368 Tags
dfbe7995902e74b51e43a08f3ddc39f415e7075b
Commit Graph

31 Commits

Author SHA1 Message Date
Christian Kandeler
698144e32e Add qbs project files for autotests. 
Note: Since not all autotests are able to run from an installed location,
we need to be able to start them from the build directory, which
in turn forces us to set a destination directory for libraries and plugins,
so they will be found at run-time.

Change-Id: Idcf7e1333dfa6e9dbf745391b78c035f842ccc5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-09-09 12:16:09 +02:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Fawzi Mohamed
285bffd99b tests/qmlproject: adding utils lib 
Change-Id: I80c952ef8571229893adc6002b39812d6b738b9e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-01-16 15:46:35 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Bill King
3593fe08ae tests: add licence headers 2011-02-18 14:48:16 +01:00
Kai Koehne
c4e4913870 QmlProject: Add mainFile property 
The mainFile property of QmlProject is the default file to run. People
have still the opportunity to override this in their run settings,
though.

The wizard generated code was updated accordingly. Note that this makes
projects generated by the wizard incompatible with QtCreator 2.1!

Task-number: QTCREATORBUG-3249
 2010-12-08 15:08:49 +01:00
Kai Koehne
efcac96f57 QmlProject: Add autotest for Files element 2010-12-08 15:08:49 +01:00
Kai Koehne
c4ca0060e3 QmlProject: Don't use RegExp for simple wildcard matching 
QRegExp matching is quite expensive, and has to be done for every file
in the project directory tree against all possible suffixes. Optimize
for the common case that the pattern is "*.suffix" by doing a
fileName.endsWidth(suffix) in this case.

This speeds up loading of examples/declarative/declarative.qmlproject by
about 30%.

Reviewed-by: Christian Kamm
 2010-10-29 09:41:20 +02:00
Bill King
524a9ac4a8 tests: more test project cleanup 2010-10-21 14:49:58 +10:00
Bill King
d95f3324c7 tests: remove unnecessary TARGET = tst_$$TARGET 
"CONFIG += testcase" does this for us, and is the proper way to do this.
 2010-10-20 15:03:01 +10:00
Bill King
eb498ee428 Tests: some cleanup of pro files, marking of tested components. 2010-09-06 14:19:32 +10:00
Bill King
f823c4810e Add "make check" support to testcase makefiles. 2010-07-13 11:59:37 +10:00
Kai Koehne
b9aa3e9b6c Qml autotests: Fix compilation errors 2010-06-29 10:10:08 +02:00
Kai Koehne
3984c057b8 QmlProject file format: Let filters recurse by default 
E.g. "QmlFiles {}" now also monitors subdirectories by default, while
"QmlFiles { paths : ["bla.qml"] } does not.

Task-number: BAUHAUS-503
 2010-03-22 10:21:18 +01:00
Kai Koehne
c722282cf3 QmlProjectManager: Rename 'libraryPaths' property to 'importPaths' 
Suggested by Erik Verbruggen
 2010-03-19 15:15:36 +01:00
Kai Koehne
884ba93bfc QmlProjectManager: Fix autotests 2010-03-12 12:41:02 +01:00
Kai Koehne
481d7cd6db QmlProject files: Make "paths" property an array 
Instead of letting the list of files being a (comma separated) string
it's now a full JavaScript array. E.g.

  paths: ["file1", "file2"]

This unifies it with e.g. the libraryPaths property
 2010-02-22 13:47:11 +01:00
Kai Koehne
b5646d35da Don't show error message if file added to qmlproject is picked up 
Check for the case that a new file to be added to a .qmlproject
is also automatically covered e.g. by a wildcard filter. In this
case we don't have to do anything.
 2010-02-17 11:22:37 +01:00
Kai Koehne
8577347446 Add libraryPaths array to Project element (.qmlproject format) 
Will be passed to qmlviewer with the "-L" option. Storing this in
the .qmlproject file format itself (and not in the .user file) is useful
in case the libraries are relative/part of the checkout that is shared
between users/computers.
 2010-02-03 09:13:53 +01:00
Kai Koehne
bafe4468aa Add support for JavaScriptFiles and ImageFiles elements to .qmlproject 2010-01-29 12:15:47 +01:00
Kai Koehne
269506c99c Add new JavaScriptFiles & ImageFiles element to .qmlproject file format 2010-01-29 12:15:47 +01:00
Kai Koehne
10dc30fa13 Add support for 'paths' property in QmlFiles element 2010-01-29 12:13:12 +01:00
Kai Koehne
fc4d82d29d Extend test case to include "." as directory 2010-01-29 12:13:12 +01:00
Kai Koehne
2181a93a1b Let QmlProjectItem return always absolute paths 
We're converting the path to absolute ones in QmlProject anyway ...
 2010-01-29 12:13:11 +01:00
Kai Koehne
47155f8518 New qml based .qmproject file format 2010-01-29 12:13:11 +01:00