summaryrefslogtreecommitdiffstats
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* rename configure.exe => configureapp.exeOswald Buddenhagen2016-10-041-1/+1
| | | | | | | | | | now that the bat file is responsible for displaying the help in addition to bootstrapping configure, the exe file should not shadow it any more. amends c027cffbe. Change-Id: I5c8a52f59ff455575e646fae55cd214db98a3736 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-08-291-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf53aa21bf0f8fbd13c0ce2d33ddf7bc63d0d76a and 3aaa5d6b32130d3eeac872a59a5a44bfb20dfd4a were reverted because of reconstruction in 5.7. defineTest(qtConfTest_checkCompiler) in configure.pri is smart enough to cover the case in a9474d1260a8c8cc9eae14f2984098919d9684e5. DirectWrite: Fix advances being scaled to 0 Since 131eee5cd, the stretch of a font can be 0, meaning "whatever the font provides". In combination with ec7fee96, this would cause advances in the DirectWrite engine to be scaled to 0, causing the QRawFont test to fail. Conflicts: configure mkspecs/features/uikit/device_destinations.sh mkspecs/features/uikit/xcodebuild.mk src/corelib/global/qglobal.cpp src/corelib/global/qnamespace.qdoc src/plugins/platforms/cocoa/qcocoamenuitem.h src/plugins/platforms/windows/qwindowsservices.cpp src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp src/widgets/kernel/qapplication.cpp tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp Change-Id: I4656d8133da7ee9fcc84ad3f1c7950f924432d1e
| * Update gitignoreMaurice Kalinowski2016-08-191-0/+2
| | | | | | | | | | | | | | Add files generated for winrt Visual Studio projects Change-Id: I7e6bf120b115743b836107be4e83147dd671cbe3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | rename the -redo status file to config.optOswald Buddenhagen2016-08-121-0/+1
| | | | | | | | | | | | | | | | | | configure.cache is really kinda misleading. the old name is still recognized for backwards compat. Change-Id: I5ca461e99a0f9336ad70adfa5b8f6bb81ad73bbb Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-08-011-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure 5.7 now supports clang on android; but dev re-worked configure src/gui/kernel/qevent.h One side renamed a parameter of a constructor; the other added an alternate constructor on the next line. Applied the rename to both for consistency. tests/auto/tools/moc/tst_moc.cpp Each side added a new test at the end. .qmake.conf Ignored 5.7's change to MODULE_VERSION. configure.json No conflict noticed by git; but changes in 5.7 were needed for the re-worked configure to accommodate 5.7's stricter handling of C++11. Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
| * Update .gitignoreGiuseppe D'Angelo2016-07-261-0/+2
| | | | | | | | | | Change-Id: Ib091f294c8557a44a2c39594fcf6f2d39de1d7e2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Update .gitignoreGiuseppe D'Angelo2016-07-261-0/+5
|/ | | | | Change-Id: Id90e9441d0e30ec5468032328b890577c349c320 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Ignore more build artifacts from in-source builds.Jake Petroules2016-06-161-0/+3
| | | | | Change-Id: I2cc810099d67692314edda7cf024ba0f7fb25012 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* normalize structure of plugandpaint exampleOswald Buddenhagen2016-05-031-1/+0
| | | | | | | | as in other examples which come with plugins, use an additional hierarchy level which contains the app and plugin subdirs. Change-Id: I2487755967aa3474c337c8c8af10be49627b63d0 Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
* rewrite qtAddToolEnv()Oswald Buddenhagen2016-01-081-0/+4
| | | | | | | | | | | | | | | | | | | | | the primary purpose is making env var prepend mode work for unset variables on windows. this is achieved by using a conditional and delayed variable expansion. however, the latter is disabled by default and can be locally enabled only in batch files. therefore, write wrapper scripts and substitute them for the actual commands. we do this also on unix, both for consistency and simply because the commands look much less confusing. this change is slightly backwards-incompatible, as invoking qtAddToolEnv() multiple times on the same command will now make a total mess. also, invoking it on a command that contains 'make' macro expansions isn't a good idea, so testcase.prf needed an adjustment. the function is an undocumented internal, so Nobody Should Care (TM). this also reverts 80ebedecf9, as it's obsolete now. Change-Id: I8394b77868b495abcf27b688996ca74c40b80994 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Remove qtdemo from gitignoreRainer Keller2014-09-171-1/+0
| | | | | | | QtDemo was removed with a commit in qtdoc. Change-Id: I1803e041e7da57641148a37691ffdc6ae6c85ad9 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Add .dylib and .d to .gitignoreFrederik Gladhorn2014-03-291-0/+2
| | | | | | | This makes in-source builds on mac somewhat bearable. Change-Id: I8c9e8e470acf90b03ee25e21dbbdd61ae2656820 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* GitIgnore updatesOrgad Shaneh2013-12-091-1/+4
| | | | | | | | | * ANGLE artifacts * qfeatures Change-Id: I3cb8f78bf02119233f115ec53d536c05dd9776e7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Long live QCommandLineParser!David Faure2013-08-241-0/+1
| | | | | | | | | | | | | | The QCommandLineParser class provides a means for handling the command line options. QCoreApplication provides the command-line arguments as a simple list of strings. QCommandLineParser provides the ability to define a set of options, parse the command-line arguments, and store which options have actually been used, as well as option values. Done-with: Laszlo Papp <lpapp@kde.org> Change-Id: Ic7bebc10b3f8d8dd06ad0f4bb897c51d566e3b7c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* configure: Remove v8snapshot vestigesSergio Ahumada2013-08-201-1/+0
| | | | | | | Change-Id: I0a43320ca0ab7cc416b07396ebc795215d84fe10 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add generated atspi2 files to .gitignoreJ-P Nurmi2013-08-081-0/+2
| | | | | Change-Id: I6ffa39b6a8387975defb7debbb5076581a9cb672 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Integrate gcov support into Qt build system.Sergio Ahumada2013-08-071-0/+2
| | | | | | | | | | | | To instrument a Qt application or library with the gcov coverage tool, do `CONFIG+=gcov' in the application .pro file. To instrument Qt itself with gcov, use the `-gcov' configure option. Change-Id: If24e91d95318609b0df1a76ed6d679bd92bcaab2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* tst_qdbusabstractinterface: generate interface at compile timeDavid Faure2013-05-091-0/+1
| | | | | | | | in order to test for regressions in qdbusxml2cpp too. Change-Id: Icd2a6f319c5fabf0b0f2a1fe8c70afcd2c84263e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Long live QLockFileDavid Faure2013-03-051-0/+1
| | | | | | | | | | | Locking between processes, implemented with open(O_EXCL) on Unix and CreateFile(CREATE_NEW) on Windows. Supports detecting stale lock files and deleting them. Advisory locking is used to prevent deletion of files that are still in use. Change-Id: Id00ee2a4e77a29483d869037c7047c59cb909339 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add .device.vars to .gitignore.Frederik Gladhorn2013-03-011-0/+1
| | | | | Change-Id: Ia119a33faa6e0e84cb8a002e2ee9f9a745d31f1c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-191-0/+3
| | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I2a2da2f8db41b41601566e66238affa3dcc66dff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix docs for Drag and Drop examplesPaul Olav Tvete2012-11-301-0/+2
| | | | | | Change-Id: Ic1622b64603f7634b697bd7d8412dcc9f1a8c3fa Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add VS manifest files to .gitignoreJ-P Nurmi2012-11-231-0/+3
| | | | | Change-Id: I3aea869d870bdba047b4e86d2034c25eb62075f8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Cleanup Symbian specific rules from .gitignoreJ-P Nurmi2012-11-231-29/+0
| | | | | Change-Id: I0a47ae19d327af54e54cca94a04d90b543855988 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Drop Symbian Carbide settings from .gitignoreaavit2012-10-261-7/+0
| | | | | Change-Id: I429343246714e26690ffd9748e5e6873509c6625 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Remove the <module>version.h files from .gitignore.Stephen Kelly2012-09-271-13/+0
| | | | | | | | | | Since e0839abbb4d22369f7171b3257217670aa06d6da they are created in the build dir, not the source dir. Further, they are generated in the include/ dir in the build dir, which is also already ignored for in-source builds. Change-Id: I0e709abf4b2b40351eb2728a36e9e238e3fc98bc Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Updated .gitignoreJ-P Nurmi2012-08-181-0/+11
| | | | | Change-Id: Ic5abac7bbcd74180dbe762b7871bb865bd2fbb76 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add the CMake directory created during unit testing to .gitignore.Stephen Kelly2012-07-231-0/+1
| | | | | | Change-Id: I769857ffca9ff14147d6704079fd0a55ff82fb79 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update .gitignore to ignore mkspecs/default-hostThomas McGuire2012-07-091-0/+1
| | | | | | Change-Id: Idc497acbd11730635fccbbc558f46dc5b5b40a0c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update .gitignoreGiuseppe D'Angelo2012-06-291-0/+2
| | | | | Change-Id: Iad041f3bc58544817b0a988875eed7b7973fa65b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* ignore mkspecs/modules-inst/Oswald Buddenhagen2012-06-261-0/+1
| | | | | | | only generated files in there Change-Id: I6eb327fc686af08d46d343066420525bc2e0dde5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add imports directory to ignore listYuchen Deng2012-04-111-0/+1
| | | | | Change-Id: Iac2ae46ff606e6c71628ca480ac1b5fe82d9bf4e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* device: Add -device and -device-option to configureGirish Ramakrishnan2012-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | For some reference platforms and SDKs we will need to pass in extra paths. Currently users have to modify the mkspec to adjust paths or set environment variables that will be picked up. This change introduces the -device <name> and -device-option <key=value> option. The key value pairs will be written to a qdevice.pri and can be used by the qmake.conf of the device spec. The reason to not save the key value pairs in qconfig.pri is becase of the fact that the device spec loads the qdevice.pri earlier than the qconfig.pri. qdevice.pri allows the mkspec to set the compiler flags and qconfig.pri allows configure to add to those compiler flags. Done-with: Holger Freyther Change-Id: I931a197b8be72397e1eedfee09502eefc01c9d4f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Add configure bootstrap generated files to .gitignoreShane Kearns2012-03-221-0/+4
| | | | | Change-Id: Ic538f46eabdf3de96d79c6e2f56627e47933bbab Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Add bin/qdoc to .gitignoreGiuseppe D'Angelo2012-03-141-1/+1
| | | | | | | | Changing .gitignore to match qdoc* instead of qdoc3*. Change-Id: I94e41e6e4371c40e0dbc33639ca02523986149b0 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add src/concurrent/qtconcurrentversion.h to .gitignoreBradley T. Hughes2012-02-231-0/+1
| | | | | | Change-Id: I521d9809b5e7a67db1370dd178d3795beee2a388 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Import QMimeType / QMimeDatabase into QtCore.David Faure2012-02-181-0/+2
| | | | | | | | | | | | | | | | History of the development before the import: ssh://codereview.qt-project.org/playground/mimetypes.git Mimetype definitions come from shared-mime-info where available (UNIX systems), loaded using a mmap'ed binary cache generated by update-mime-database. As a fallback if no cache is found, we parse the raw XML files otherwise. This makes the MIME type support fast and with very low memory usage on UNIX, and it makes it easy to use on Windows (no dependency on shared-mime-info, Qt even includes a freedesktop.xml file to use if none are found on the system). Change-Id: I27b05008216ff936dc463bd80d3893422bfb940e Reviewed-by: Richard J. Moore <rich@kde.org>
* Update .gitignore to ignore qmake/qmake_pch.pchBradley T. Hughes2012-02-031-0/+1
| | | | | | | This file is generated when building qmake on Windows Change-Id: I554bb2d32cfeff6791d664a5ca7b3d605db38c77 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove references to openvgversion.hLiang Qi2012-01-141-1/+0
| | | | | | | Because OpenVG was removed from qtbase. Change-Id: Id92ac98a6dee7679248bc3c82554e92386e7ef61 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Remove QtV8 library from QtBaseSimon Hausmann2012-01-091-3/+0
| | | | | | | | | | The QtV8 library is going to live in the qtjsbackend module. Change-Id: I72251316163829411dda998b9503ce6f75b3606a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add V8 snapshot supportKent Hansen2011-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | A V8 snapshot is a serialized representation of the JavaScript heap. Using a snapshot can vastly speed up V8 initialization. This commit introduces a new tool, mkv8snapshot. mkv8snapshot is automatically invoked as part of building QtV8, and generates a .cpp file which is compiled into the QtV8 library. Because mkv8snapshot itself needs to initialize the V8 environment the non-snapshot way (i.e., by evaluating thousands of lines of JavaScript), it needs to build all of V8. This means that V8 is effectively built twice when snapshots are enabled. When cross-compiling, only host=i386 and target=arm is supported, since that's the only relevant case for which V8 currently supports a simulator. mkv8snapshot is built and run as a host tool (using the simulator), and generates a snapshot that will be used on the target. Task-number: QTBUG-21152 Change-Id: I9270652f129505508f78db8b0a39fbf57dc8b86d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update .gitignoreDavid Faure2011-11-081-35/+53
| | | | | Change-Id: Ie304ec2776d6fdef734da8bbc22e8dea77417c78 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update .gitignoreBradley T. Hughes2011-10-031-0/+3
| | | | | | | | | | | | | Add these 3 files to .gitignore: src/platformsupport/qtplatformsupportversion.h src/printsupport/qtprintsupportversion.h src/widgets/qtwidgetsversion.h Change-Id: Ie13360de9e64e79cb714adba0d2f6e6da0051ae8 Reviewed-on: http://codereview.qt-project.org/5797 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove uilib and QtUiTools from QtBaseLars Knoll2011-09-131-2/+0
| | | | | | | The code gets moved into the qttools repository, where it belongs naturally. Change-Id: Ia50bfe212ead3365d5c3bcb24d2c5e92e2e9de8e
* update gitignoreOswald Buddenhagen2011-09-121-2/+4
| | | | | | | | | (cherry picked from commit ba564e089134980200c1c71879f2474135bee5fa) Change-Id: Id3a83228d178cefbec21b07f7e6439e3ea92b962 Reviewed-on: http://codereview.qt-project.org/4572 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add src/v8/qtv8version.h to .gitignoreBradley T. Hughes2011-08-311-0/+1
| | | | | | | Change-Id: I3e63a3b7cfc06ea4b71c55c1530433438c902aa7 Reviewed-on: http://codereview.qt.nokia.com/3979 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Remove obsolete testlib files from .gitignoreJason McDonald2011-08-291-2/+0
| | | | | | | Change-Id: I8d0ff9cad1da7df3e5e0d18e8f19b17b468afc01 Reviewed-on: http://codereview.qt.nokia.com/3368 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* update .gitignoreCharles Yin2011-08-241-0/+44
| | | | | | | | | | | 1. generated module def files 2. generated version headers 3. unit test executables Change-Id: Ibce72e89882e646ff0a450d68031e8e3a5cea085 Reviewed-on: http://codereview.qt.nokia.com/3346 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Add QT_xxx_VERSION macros for each library in qtbaseLiang Qi2011-05-101-0/+10
| | | | | | | Provide version info for each library like QTCORE_VERSION and etc. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* Add .gitignore to each moduleaxis2011-04-271-0/+261