summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
...
| * Test that the CMake files create appropriate version variables.Stephen Kelly2013-04-051-1/+19
| | | | | | | | | | | | | | Change-Id: I1d8061302fbb8494b5ae31e20a644745fe969f10 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Don't redundantly define cmake package *_VERSION variablesStephen Kelly2013-04-051-3/+1
| | | | | | | | | | | | | | | | These variables are set by the ConfigVersion.cmake file already, so no need to maintain them manually in the Config file too. Change-Id: I73d949fb22052f4f6acbc1f70518e73f8fbf7c9c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Look for cmake package dependents only in the parent directory.Stephen Kelly2013-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | Fedora uses configure options to set the install prefix to a location which does not contain the cmake config files. Rather than finding dependencies from the installation prefix, find them in sibling directories instead. Change-Id: I06974e9655d0dda2a18064d0f9a33997cf2cb2d3 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Fix pathing problem with our dx.batRay Donnelly2013-04-051-1/+1
| | | | | | | | | | | | | | Need to look in <android-sdk>/platform-tools/lib for dx.jar Change-Id: I104cf157ce1795e907cca31b37c62163248b8d77 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Include PRECOMPILED_DIR in dirs fixed by fixExclusiveOutputDirs()Tor Arne Vestbø2013-04-031-1/+1
| | | | | | | | | | | | | | | | | | It's written to qmodule.pri by configure with a hard-coded path, and hence need fixing up or appending, depending on which exclusive builds are used. Change-Id: I069c04438dc303868a76349c9bdd385adc074c0a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-04-031-0/+3
| |\ | | | | | | | | | refs/staging/stable
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+3
| | |\ | | | | | | | | | | | | Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb
| | | * ensure that each module has a .qmake.cache when properly qmake'dOswald Buddenhagen2013-03-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes properly configured modules (whose top-level project file was evaluated) uniformly recognizable. Change-Id: Ib127df2becb2ff7f51ee8cc5a194ff168b41c227 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | | Load sdk.prf first, if enabled, so that other features can use QMAKE_CXXTor Arne Vestbø2013-04-031-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | Extra-compilers such as objective_c.prf may reference QMAKE_CXX, so we need to sysroot it before it's used. Change-Id: I1e367b3d0816096300a441786619f298134de0a6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Don't duplicate SIMD QMAKE_CFLAGS for ClangTor Arne Vestbø2013-04-101-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | The correct CFLAGS are already present in gcc-base.conf, which is used as a basis for g++, LLVM, and Clang. Change-Id: Ic19e28edc55e109ecfe372826b295b817afcd36e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-035-4/+116
|\| | | | | | | | | | | Change-Id: Id96d4076610366a7cc66c8d8382ca25c33eaa71d
| * | Android: Portability fix for java usage on Windows.Ray Donnelly2013-04-031-1/+1
| | | | | | | | | | | | | | | Change-Id: Ic72957e21b2edc92d2ca8d99099f221ffeeb8c95 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Android: Enable the java feature on Windows.Ray Donnelly2013-04-032-1/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in dx.bat in the Google Android SDK tool where relative paths do not work correctly. We need to use our own version of this tool until: https://android-review.googlesource.com/#/c/52680/ ..is merged. Change-Id: I451a3239590919d014a673f3e8e17244e96676ab Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Android on Windows: Add 2 missing qmake variables.Ray Donnelly2013-04-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to build Android Qt on Windows via cmd.exe using the unix makefile generator, mkspecs/common/shell-win32.conf needs QMAKE_SYMBOLIC_LINK and QMAKE_LN_SHLIB Change-Id: I1b3eded66cec06ab131f127c1d46b99124613561 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | move the setup of QT_INSTALL_DOCS from qdoc to qt_docs.prfOswald Buddenhagen2013-04-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is a qt specific option and really should not be hard-coded. also, the implementation used undocumented api that is internal to the bootstrapped process, which made it impossible to de-bootstrap it. Change-Id: If706960671744e64a9a7c366437977a800a6058e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | prefer 'release' for non-bootstrapped host build_all configsOswald Buddenhagen2013-04-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... like qt_tool does. otherwise we get linker errors with debug builds on windows. Change-Id: I583f277ff3fb75c9fe5f305a6f1b5d066b840c07 Reviewed-by: Debao Zhang <hello@debao.me> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | iOS: Specify framework dependencies in the right placeTor Arne Vestbø2013-03-311-3/+0
|/ / | | | | | | | | | | | | | | | | Instead of unconditionally linking to Foundation, UIKit, and QuartzCore, we leave the dependencies for the iOS platform plugin, where the libs are actually used. Change-Id: Ie8cfad2c8230d1f1af6933b831e443fecb0c93f1 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | Fix '=' alignment and replace tabs in *.conf (whitespace only change)Axel Waggershauser2013-03-27123-2810/+2810
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace all tabs with proper space characters and consistently align the '=' characters. The default alignment for the '=' of 25 characters has been left as is to get a minimal diff. Lines with the '=' further to the right and those belonging to 'proper code (TM)' have not been touched. The work was mostly done using the following python script (might come in handy again...): import sys, re indent_eq = 25 + 0*4 # 25 characters was the most widely used indentation for the '=' character p = re.compile(r'(\w+)[ \t]*([\-\+]?)(=$|= )[ \t]*(.*$)') for fn in sys.argv[1:]: with open(fn, 'r+') as f: lines = [] nl_count = 0 continuity_indent = None for l in f: m = p.match(l) nl = l if m: n_spaces = max(m.start(3), indent_eq - 1) - len(m.group(2)) - len(m.group(1)) if m.group(2) and m.start(2) >= indent_eq-1 and m.start(2) % 4 == 0: n_spaces -= 1 # left-shift '+=' by one if the '+' is aligned to a multiple of 4 n_spaces = max(1, n_spaces) # we want at least one space before '='/'+=' nl = m.group(1) + ' '*n_spaces + ''.join(m.group(2,3,4)) + '\n' continuity_indent = nl.find('= ') + 2 if l[-2] == '\\' else None # remember indent on '\\$' elif continuity_indent: nl = ' '*continuity_indent + l.lstrip() if l[-2] != '\\': # check when to stop the continuation continuity_indent = None elif l.startswith('#'): nl = l.expandtabs(2) if l != nl: nl_count += 1 lines.append(nl) if nl_count > 0: print fn, nl_count, len(lines) f.seek(0) f.writelines(lines) f.truncate() Change-Id: I1d2870d0a2fe2e30d398c140fe523e69dd20c81b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Populate includes, defines and pic flags in target interfaces.Stephen Kelly2013-03-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used by features in CMake 2.8.11. This matches the features in FindQt4 in that version of CMake, namely that the IMPORTED targets contain the appropriate INTERFACE_INCLUDE_DIRECTORIES and INTERFACE_COMPILE_DEFINITIONS and that the qtmain.lib static library is automatically linked to on Windows by executables. Additionally, the INTERFACE_POSITION_INDEPENDENT_CODE property is set appropriately if Qt requires users to use position independent code. Change-Id: Ide341f43fcaf7d722a7bdf1a12b1071c7e548ccc Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | raspberry pi: add /opt/vc/include/interface/vmcs_host/linux to GL includesv5.1.0-alpha1Volker Krause2013-03-271-1/+3
| | | | | | | | | | | | | | This matches upstream changes on https://github.com/raspberrypi/firmware/ Change-Id: Ie28c2fa574d5cd097c033926970db40e8904e42e Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Revert "Don't duplicate the 'top-level' include dir in all modules."Stephen Kelly2013-03-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This will likely fix some odd cmake related tests in the CI. This reverts commit 316d8ececa3314ec16baf46ec4f1c5440cd951ef. Conflicts: mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in src/corelib/Qt5CoreConfigExtras.cmake.in Change-Id: Ib7714746f96bf12061d92242a42296d200c56c00 Reviewed-by: David Faure (KDE) <faure@kde.org>
* | Fix the CMake tests with CMake release candidates.Stephen Kelly2013-03-261-0/+2
| | | | | | | | | | | | | | | | The version number parsing needs to handle the reported version string. Change-Id: Ifd34b2c86b21a1c5e4c91a43447468ca6feab8cf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Get more information from failing cmake tests.Stephen Kelly2013-03-261-1/+4
| | | | | | | | | | | | | | Enable verbose makefile output which will appear in failure logs. Change-Id: I005069c122f46887f6095034d9cf1a3d2fdbc750 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix whitespace issues in *.prfAxel Waggershauser2013-03-223-21/+21
| | | | | | | | | | | | | | | | Replaced tabs with spaces to align with space-indented code and removed some trailing whitespace. Change-Id: I4930afc3df206ef8ee96de3e69f0d69fc4a1c77c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Update WEC7 ARM mkspec.Janne Anttila2013-03-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Added QT_NO_CLIPBOARD, QT_NO_ACCESSIBILITY and opengles2 libs. Clipboard and accessibility are not supported in WEC7. Opengl ES2 libs are required for building qtgui (and other opengl dependent) modules. Change-Id: Ie45612bd7bada00bfcb92a0885c4bd685b82bd02 Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'gerrit/release' into stableSamuel Rødal2013-03-2111-27/+23
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
| * activate example (non-)build magic only in configured treesOswald Buddenhagen2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | otherwise we assume that the user is trying to build a random example which just happens to live inside a qt module's repository. Task-number: QTBUG-29756 Change-Id: I17f217b4235fbe04f2c49d1d92ce08b86bb259b9 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * pass module version to syncqtOswald Buddenhagen2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is cleaner than having it parse qmake project files. the only remaining built-in version extraction is the fallback to qglobal.h needed for bootstrapping. as a "side effect", this fixes the build of modules with mismatched versions centralized in .qmake.conf, as this was simply not handled so far. the -mkspecsdir syncqt option goes away, as there is no use case for it any more. Task-number: QTBUG-29838 Change-Id: I6912a38f0e93a26bc267a9e3d738506fd3ad431b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * fix LD_LIBRARY_PATH setup of check targetsOswald Buddenhagen2013-03-151-5/+2
| | | | | | | | | | | | | | amends 4c34b418 Change-Id: Id9d214fe936d947aaea4a56fd724ad50381032e1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * fix replacement base pathOswald Buddenhagen2013-03-152-2/+2
| | | | | | | | | | | | | | | | this affects only webkit when doing module-by-module installation, so it went unnoticed. Change-Id: Iab87f4a76fcb0fa9a1b1d6bcab9a73756e416120 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * enumerate modules in QT_MODULES, not QT_CONFIGOswald Buddenhagen2013-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_CONFIG is supposed to contain configure output, not a list of modules. for example, enumerating modules is not cleanly possible if modules are mixed with other flags. the conflation was merely historical, due to webkit and phonon doing it this way in the preliminary qt4 modularization. we now have a much cleaner way to query modules (qtHaveModule(<module>), or less recently, !isEmpty(QT.<module>.name)), which is already used throughout Qt. the old way was supposed to be removed for 5.0 already, but it slipped. better do it now, before people actually start using it. Change-Id: Iabdf0cdfaab9cd674f634f4c6ece105b2039c850 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * broaden the effect of CONFIG+=force_independent somewhatOswald Buddenhagen2013-03-154-6/+7
| | | | | | | | | | | | | | | | | | | | | | modules which demand it (i.e., qtwebkit) need forwarding pris, etc., even when not making a -prefix build. Change-Id: Id405be8763e94cc074854f799bd785e9cdf62e8e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * fix parallelized "jom install"Oswald Buddenhagen2013-03-152-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unlike unix' mkdir -p, windows' md complains if the directory already exists. the workaround is a quite complex command, so the so far used concept for assembling the command line from pieces was replaced with a single template. for symmetry, adapt the makefile existence check to the new concept as well. QMAKE_CHK_EXISTS and QMAKE_MKDIR_CMD were added, with hard-coded fallbacks (ugly). QMAKE_CHK_FILE_EXISTS and QMAKE_CHK_EXISTS_GLUE (introduced in 5.0.0) are simply deleted again. QMAKE_CHK_DIR_EXISTS and QMAKE_MKDIR remain for legacy reasons, as qmake emits them into the Makefiles, and custom commands may rely on their presence. Task-number: QTBUG-28132 Change-Id: I3d049cb5d26947e5c3d102d0c2da33afb2a95140 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge "Merge branch 'dev' into stable" into refs/staging/stableSergio Ahumada2013-03-20148-2196/+1427
|\ \
| * \ Merge branch 'dev' into stableOswald Buddenhagen2013-03-20148-2196/+1427
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Conflicts: src/gui/text/qfontdatabase.cpp src/gui/text/qharfbuzz_copy_p.h src/widgets/kernel/qapplication.cpp src/widgets/kernel/qcoreapplication.cpp Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b
| | * | Whitespace cleanup: remove trailing whitespaceAxel Waggershauser2013-03-1620-408/+408
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | bring bootstrapped QT magic from qt_tool to qt_moduleOswald Buddenhagen2013-03-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project files of bootstrapped modules can, just like those of bootstrapped tools, benefit from automatic adjustment of QT (and CONFIG). Change-Id: I83815e69a2b105caaee0c2e2602828f8eb425eef Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * | don't bootstrap tools when not necessaryOswald Buddenhagen2013-03-142-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bootstrapping is only necessary if we are cross-compiling or have a circular build dependency. Change-Id: I17244457652ca9d4fc797043e57070c2ae3ee5d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * | iOS: Don't warn about using C++11 extensionsTor Arne Vestbø2013-03-141-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt uses a lot of minor C++11 extensions such as long long, commas at the end of enumerator lists, and extra ';' outside of a functions, and not all of these can be silenced, so we build without warnings for C++11 extensions, since we plan to enable C++11 at some point anyways. Change-Id: I3ede2fb653c25475a3bd2b860c0c80c6cf6abef5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | Fix interaction between sdk.prf and silent.prfTor Arne Vestbø2013-03-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'silent' option to CONFIG will mangle QMAKE_CXX and friends by prepending an @echo, which sdk.prf doesn't handle (it assumes the variables contain names of executables, with optional arguments). Instead of teaching sdk.prf generic command line parsing we ensure that silent.prf does its job at the very end, when the tools have already had their paths fixed by sdk.prf. Change-Id: I7093232e5cc37ed8106a3b838f42ad8f1a43fb86 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | consolidate syncqt invocationsOswald Buddenhagen2013-03-132-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic28ea95201501b05c4a62366d1f70fa120161927 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Use tools from the SDK's toolchain instead of the ones in /usr/binTor Arne Vestbø2013-03-132-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Mac OS X we currently specify build tools without an absolute path, which means we end up using the ones in /usr/bin. This is wrong, we should be using the tools from the toolchain of the chosen SDK. For iOS we do specify an absolute path, by resolving the toolchain path in the iOS makespecs. To solve the situation on Mac OS X, we move the logic of resolving the toolchain path to sdk.prf, and share it between OSX and iOS. For configure we need to duplicate some of the logic from sdk.prf, as configure pulls out QMAKE_CC and QMAKE_CXX for running some initial tests and building qmake. The new macSDKify function also solves the issue of missing sysroot and deployment version in the flags. Change-Id: Ib1d239c9904cf3ccee5214b313cf6205869a1462 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Simplify how we resolve the SDK root on Mac OSTor Arne Vestbø2013-03-131-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now take advantage of the fact that xcodebuild -version allows you to pass the key that you're interested in, to only print that single value. This technique is used by Apple's own build scripts as well. Change-Id: I57b8424590d4137a0e7f263a318e17ee2e0dfad4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| | * | Hide Harfbuzz from the outer worldKonstantin Ritt2013-03-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't export, don't generate private headers, don't mention HB in API. Change-Id: I048ebd178bf4afaf9fda710a00933b95274cf910 Reviewed-by: Josh Faust <jfaust@suitabletech.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * | make QT setup for bootstrapped tools more cleverOswald Buddenhagen2013-03-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of simply overwriting it, intelligently re-interpret it. Change-Id: I5f7d8fff69ac8092653d7583da4c3884b9864b3a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * | make qml_plugin.prf usable without a parent c++ moduleOswald Buddenhagen2013-03-121-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so far the assumption was that every qml plugin/module in qt is a wrapper/extension of a corresponding qt module. this not the case for the upcoming quickcontrols, for example. Task-number: QTBUG-28200 Change-Id: If4b8bb6633e76b2a510908d09a010cee12d33634 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * | remove redundant codeOswald Buddenhagen2013-03-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | amends bb6b2f407 Change-Id: Ib56c502350bf46db352fb36d0ce46b6eb7c8ff58 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | iOS: Move arch handling out of ios.prf now that we have default_post.prfTor Arne Vestbø2013-03-122-25/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifad6463414d4fb055007653d06f2c17ca5ee953e Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| | * | Don't force disable accessibilityGunnar Sletta2013-03-121-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I75a2d4565272bbcd27ec4ca9a3806a4c114c3442 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * | Remove Q_OS_LINUX_ANDROID.Gunnar Sletta2013-03-122-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is unused in the source code and replaced by Q_OS_LINUX, Q_OS_ANDROID and Q_OS_ANDROID_NO_SDK depending on usecase. Change-Id: If8d561540e7583fbac83c0f3506f219c4433e847 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 20:12:57 +0000