summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmake/testdata
Commit message (Collapse)AuthorAgeFilesLines
* Change to commercial license headers in preparation for release.Jason McDonald2010-09-0752-676/+676
| | | | Reviewed-by: Trust Me
* escape backslashesOswald Buddenhagen2010-05-261-1/+1
| | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* Update copyright year to 2010Jason McDonald2010-01-0652-52/+52
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-09-291-1/+1
|\ | | | | | | | | | | | | | | Conflicts: doc/src/platform-notes.qdoc src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| * Mac: build issue (autotest stalls build)Richard Moe Gustavsen2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When building Qt static on Mac, the test included actually stops the build process, prompting the user for 'Promteroo?' The reason is that configure runs qmake on all the tests inside the test/auto directory, including the one that is meant for testing qmake itself. In other words, this test should not be qmake'ed when running configure, only when running the qmake auto test. However, the qmake auto test does not run the prompt test anymore either. So the solution for now is to just comment out the test project as well. Reviewed-by: alexis
| * Update license headers again.Jason McDonald2009-09-0851-204/+204
| | | | | | | | Reviewed-by: Trust Me
* | Update license headers again.Jason McDonald2009-09-0952-208/+208
| | | | | | | | Reviewed-by: Trust Me
* | Add missing license headers.Jason McDonald2009-08-311-0/+41
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-3151-663/+663
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-3151-663/+663
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1151-51/+51
| | | | | | | | Reviewed-by: Trust Me
* | Update the qmake autotest: re MSVC test failure findMocs and findDepsKeith Isdale2009-08-312-10/+4
| | | | | | | | | | | | | | | | When MSVC is used the default DESTDIR makes use a release/debug suffix. For these tests DESTDIR needs to be "."/ Minor code cleanup was done whilst correcting these effected .pro files Reviewed-by: Lincoln Ramsay
* | Add an autotest for qmake's include functionKeith Isdale2009-08-285-0/+20
| | | | | | | | | | | | | | | | qmake's include function has been changed in 4.6.x and later to warn,by default, if the specified file does not exist. It is possible to ignore missing .pri files, eg include(SomeOptionalFile.pri, "", true); Reviewed-by: Rohan McGovern
* | Update contact URL in license headers.Jason McDonald2009-08-1251-51/+51
| | | | | | | | Reviewed-by: Trust Me
* | In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can not be found change that behavior to warn by default. Currently the default behavior of include() in a .pro file is not to warn if the supplied file argument can not be found which can lead to hard to find build errors. The include() will now,by default, warn if the specified file can not be found. If a warning is not required because the included file is optional then example use in the .pro file: include(SomePriFile.pri", "", true) Task-number:259398 Reviewed-by:Marius Storm-Olsen
* | Merge branch '4.5'Thiago Macieira2009-08-031-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| * Fixed failure of tst_qmake::simple_app_shadowbuild.Rohan McGovern2009-07-291-0/+1
| | | | | | | | Test needs a placeholder file to make sure its build directory exists.
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-1651-102/+102
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1651-102/+102
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-176-10/+25
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Remove obsolete code from autotests.Jason McDonald2009-04-161-9/+5
| | | | | | | | | | | | | | | | Each version of Qt has its own set of autotests, therefore preprocessor directives relating to obsolete QT_VERSION's are not necessary. Reviewed-by: Carlos Duclos
| * Spring cleaning in qmake testsJoão Abecasis2009-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | And some indentation fixes in qmake itself. Fixes indentation; TRUE => true; FALSE => false; #includes and #defines cleanup; removes dead code; comments... and somewhere along the way marked a function static. Reviewed-by: mariusSO
| * Long live Qt 4.5!Lars Knoll2009-03-2390-0/+3018
|
* Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-1786-0/+3005
repository to the new repository
generated by cgit v0.12 at 2025-09-15 11:53:29 (GMT)