summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* android: remove QT_NO_QWS_TRANSFORMED from mkspecsRobin Burchell2012-07-031-1/+1
| | | | | | | this does nothing anymore Change-Id: If8798335dea935d1df9f085a7b4e1658f426809b Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* android: fix stupid thinko where cflags were set before the common includeRobin Burchell2012-07-033-9/+6
| | | | | | | | | this meant that the common mkspec was unable to do 'sensible' things with the cflags (hence -Wno-psabi not being applied to C++ code), and probably explains a lot of other weird things. Change-Id: I77079027dc1b2691c53212893eb90c7b935d00a2 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* buildsystem: Remove SXE from the configure and qconfig-*.h filesHolger Hans Peter Freyther2012-07-024-20/+0
| | | | | | | The SXE feature was used with Qtopia but is long gone. Clean it up. Change-Id: I55fba97b6382300ba63e94f3a6c415227f571e37 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make the CPU detection much more efficient in user codeThiago Macieira2012-07-025-65/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | First, check that the option in question hasn't been already enabled by the compiler, via compiler switches. If it has been, then we don't need to verify anything, and we can assume that it's safe to use such instructions. For example, on an x86-64 build, qCpuHasFeature(SSE2) is always a constant true. If the compile-time check fails, then we proceed to try and detect the processor features at runtime. But instead of insisting on a call to qDetectCPUFeatures, allow the code using the detection to read from a variable and simply test it for values. Only if the variable isn't initialised should it make a function call. The Q_ASSUME allows this code to be very efficient even with multiple uses of qCpuHasFeature. Change the uninitialised value from -1 to 0 so that simpler instructions can be used to check for non-initialisation. The qDetectCPUFeatures function is renamed to qDetectCpuFeatures to match the Qt coding style and also to catch uses this code that need to be adapted. Change-Id: I24ca5a6ad21075e2e249e1a4f8f5057b8f68ce7c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix MinGW-w64 compilationJonathan Liu2012-07-022-4/+4
| | | | | | Task-number: QTBUG-24699 Change-Id: If6210315926f0266045766bb5d3b00a6d0bdf703 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Change qglfunctions autotest to insignificant on WindowsKalle Juhani Lehtonen2012-07-021-0/+2
| | | | | | | | | | | | | Previously the test was skipped, because no OpenGL context was found. After Mesa 3D OpenGL library distribution for Windows 7 machines, OpenGL context is found, but the test crashes with exit code: 0xC0000409 (STATUS_STACK_BUFFER_OVERRUN) Marking the test insignificant until the issue is resolved. Task-number: QTBUG-26390 Change-Id: I996bbc3399704b541f5baa4832cf39b77b715c1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Implement QVariant conversions for QObject derived pointer metatypes.Stephen Kelly2012-07-012-1/+77
| | | | | | | canConvert() and convert() use the metaobject to convert such types. Change-Id: Ic05e74c5c2423b4b9682b88adc856a16dcba4cff Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Store the QMetaObject with the QMetaType.Stephen Kelly2012-07-018-7/+198
| | | | | | | | This will allow conversion between pointers to compatible QObject derived types. Change-Id: I19e08934571fb3f1b91e594892214041fe5f6a11 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Don't lower the code generation level options for the compilerThiago Macieira2012-07-011-7/+9
| | | | | | | | | | | | | | | | If the default settings already include the necessary flags, do not override the compiler flags, possibly lowering support. This allows the user to specify a higher setting for a Qt build, such as what MeeGo did (it enabled SSSE3 support in all builds). Additionally, this prevents us from passing -msse2 or -arch:SSE2 options to x86-64 builds, as SSE2 is a mandatory part of that architecture. This silences a warning from MSVC that the option is unknown in 64-bit builds. Change-Id: I6e2969b672bcac87168c245b8be3309e8cc49224 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make QtNetwork compile with qconfig smallJeremy Katz2012-07-011-0/+15
| | | | | | | Task-number: QTBUG-24816 Change-Id: I8c7965e4498794db93ee51c8511c9a72071ddce3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Support the showIsFullScreen style hint in widgets.Thomas McGuire2012-06-302-13/+26
| | | | | | | | | | | | | | | Now QWidget::show() will be the same as QWidget::showFullScreen() if the style hint is set. This is consistent with QQuickView now. De-inline related methods to make it easier to change them later without breaking compatibility. Change-Id: I843ac6f846428217bfc5dc9f1d0a554de9d0c08f Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* fix bugs surrounding reading super cache when no local cache is presentOswald Buddenhagen2012-06-301-3/+2
| | | | | | | | we would ignore the early read variables and fail to export the super cache's path to the project. Change-Id: I3c467802b4af22f73be05b25dbd8ccb6196d28a8 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Flag consistently failing tests as expected fail tests.Toby Tomkins2012-06-302-2/+2
| | | | | | | | | Task-number: QTBUG-26372 Task-number: QTBUG-26371 Task-number: QTBUG-20984 Change-Id: I7ae558243c366769cd6c587e77f862558e8053a1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove stale qws related mkspecsDonald Carr2012-06-3015-691/+0
| | | | | | | | Should be be reintroduced with intent if there is sufficient interest, outside of the QWS context. Change-Id: I598f47b5cf0c10dd66534294d0f27cf0b4e5069a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Migrate linux-clang mkspec out of unsupportedDonald Carr2012-06-302-6/+4
| | | | | | Change-Id: I84abc4c305c28e46dd514d3fb78d27c051dc6048 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QAbstractProxyModel autotest doesn't need widgetsGiuseppe D'Angelo2012-06-291-1/+1
| | | | | | | After the QStandardItemModel move to QtGui. Change-Id: I2be82d89518ff97cf164026ee8b13a41f9c93d4a Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Move QStandardItem/QStandardItemModel to QtGuiGiuseppe D'Angelo2012-06-2920-25/+63
| | | | | | | | | | | The dependencies on QFont, QBrush, QIcon are all in QtGui, so there's little sense to still have these classes in QtWidgets. This also copies and pastes a version of QWidgetItemData as QStandardItemData inside qstandarditemmodel_p.h. Change-Id: Ibafc5a30748e7ce0b54753309ae6dc4a797fc20e Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Merge "Merge branch 'buildsystem' (second round)" into refs/staging/masterMark Brand2012-06-2936-943/+584
|\
| * Merge branch 'buildsystem' (second round)Oswald Buddenhagen2012-06-2936-943/+584
| |\ | | | | | | | | | | | | | | | | | | | | | | | | refactoring and cleanup. fixes x-builds between different os families. Conflicts: mkspecs/features/qt.prf Change-Id: I0205e6f07f77c9b015cf055dd87a471883949a91
| | * remove abuses of warn_msg()Oswald Buddenhagen2012-06-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | this function is not meant to be used for debug statements Change-Id: I84575e64814e2c9fd2e09c33fc680d0e6648f4ea Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * remove support for versioning qmake propertiesOswald Buddenhagen2012-06-272-61/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | the rationale is mostly the same as in 568e714fdf, plus the additional point that the qmake version didn't change for a decade. fallback paths for version 2.01a properties are provided. Change-Id: I3d3f16595eca9eca71c78fda9dbaf53da9f874a9 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * use source root also for finding featuresOswald Buddenhagen2012-06-271-0/+2
| | | | | | | | | | | | | | | Change-Id: I108914c6d2c6d06414156584aeb3a1afb0f5838d Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * move cachefile_depth calculation out of project evaluatorOswald Buddenhagen2012-06-273-5/+8
| | | | | | | | | | | | | | | | | | | | | it has no business there Change-Id: I6d1a4b55b5acacc470cc109a6c69a907abbba312 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * remove possibility to request project recursion from within a pro file againOswald Buddenhagen2012-06-276-25/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the feature was implemented for the abld/sbs2 generators only, and is of course undocumented. this reverts most of commit e795e61ef93f8080f9938ac49f2fca306644af85. Change-Id: Ibd1726b036ce6c45f8e678ea996218f774f8aed2 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * dispose of Option::host_modeOswald Buddenhagen2012-06-272-21/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | it was used only for determining the path separator, so do that directly. the -macx option went bye bye, as it is redundant with -unix now. Change-Id: Ib8344c042db56e05af75d263447311d4b43a3bf0 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * dispose of Option::shellPathOswald Buddenhagen2012-06-273-4/+1
| | | | | | | | | | | | | | | | | | | | | use isWindowsShell() in the one remaining case. Change-Id: I25eab398ef50df5a7f4ec808279b83ca900e3c58 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * assume windows shell iff dir separator is backslashOswald Buddenhagen2012-06-273-11/+1
| | | | | | | | | | | | | | | Change-Id: I411a4d6691e18b818ee7d1ced7f126f97af0902f Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * reduce a bit of code dupe while assembling feature search pathOswald Buddenhagen2012-06-271-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | instead of having a bunch of nested loops, collect into a temporary list and process it at the end. Change-Id: I97e5642f7e13f7c7b69eae00833e61cdf46a02ed Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * unset QT_MODULE_* after loading the module prisOswald Buddenhagen2012-06-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | abuses have been observed in the wild, so make sure these variables are not available. Change-Id: I502c3f5db7d341cf6a8bd2ec09e87f129da2fca6 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * purge "dumping all variables" debug loopsOswald Buddenhagen2012-06-273-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | the as-we-go dump is sufficient (and usually necessary to actually find the problem). if only the summary is interesting, the -E option can be used now. Change-Id: I9e34c6db9dcb99b38013c4d0cb80b8cb88ca36b5 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * repurpose deprecated -E switchOswald Buddenhagen2012-06-274-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | instead of dumping the variables as we are going, dump everything at the end. this is potentially useful, as opposed to the previous functionality which was redundant with -d. Change-Id: Icf14703cb93e03f7079dfc0266b219ad9c902133 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * make a bunch of functions constOswald Buddenhagen2012-06-272-7/+9
| | | | | | | | | | | | | | | | | | | | | values() and variables() get both const and non-const overloads Change-Id: Idfabea1acc488bf78f24edb831681ee07f0074c4 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * const correctness for variables()Oswald Buddenhagen2012-06-274-7/+7
| | | | | | | | | | | | | | | Change-Id: Id11453ccbae3ffa32580badadada945d342d727a Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * don't overuse variables()Oswald Buddenhagen2012-06-276-49/+49
| | | | | | | | | | | | | | | Change-Id: Ib2da88e5e29c0bfecc39a9c06e82a34a4bd0b1e6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * make magicValues() constOswald Buddenhagen2012-06-272-7/+4
| | | | | | | | | | | | | | | | | | | | | the weird debugging feature is not used anyway Change-Id: I07f481a94f2b2ab2a5b61270f0e00183cefd4cd1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * const correctness for values() callsOswald Buddenhagen2012-06-2711-99/+103
| | | | | | | | | | | | | | | Change-Id: I1476ae8d3fb7364686398c5650729dee94a8e933 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * don't use backwards compat mapping for generator accessesOswald Buddenhagen2012-06-272-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | we can rely on only user code needing variable mapping, so apply it only in the evaluator. Change-Id: I6fc58e7bcf24cf0fa8783d5341ab1e7b9f001c88 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * introduce magicValues() functionOswald Buddenhagen2012-06-272-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | the only place where the two remaining magic values need to be referencable is doVariableReplaceExpand(), so make a separate function and use it only in that place. Change-Id: I6e2fcfa3a4f16727d90ace56eb88fc99ef272ffc Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * make $$PWD non-magic on readOswald Buddenhagen2012-06-271-4/+3
| | | | | | | | | | | | | | | | | | | | | like the other variables, we can just store it in the hash. Change-Id: I49ad39dca8d498119b27f16ea4bdc44ae698d72e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * set $$_DATE_ only on project startupOswald Buddenhagen2012-06-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | this changes the semantics a bit - it will be the datetime of qmake startup rather than the time a particular file is processed. i'd argue that this is insignificant. Change-Id: I75918967bef25038ce54aa81ab03c027384c0268 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * deprecate $$IN_PWDOswald Buddenhagen2012-06-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | it suggests a symmetry to $$OUT_PWD which simply isn't there. the shorter alias $$PWD is much more popular anyway. Change-Id: Iefbfd56f1a3e526f15c9d6cd1bf59778be6f2f8d Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * make project-related variables non-magicOswald Buddenhagen2012-06-271-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | $$_PRO_FILE_, $$_PRO_FILE_PWD_ and $$OUT_PWD can be cleanly initialized. no need for magic. Change-Id: I2e339d17bae42ecb573c2f82c716f6be15a35b98 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * move initialization of $$TARGET to setupProject()Oswald Buddenhagen2012-06-271-4/+2
| | | | | | | | | | | | | | | | | | | | | that's what we have it for Change-Id: Ib734b97d337a82c73b086dfeb2b263171f2a02b7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * make $$TEMPLATE magic on write instead of on readOswald Buddenhagen2012-06-272-16/+27
| | | | | | | | | | | | | | | Change-Id: I03a68993dd7d4488f8212132a9d492d135295b9e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * make a bunch of invariant variables non-magicOswald Buddenhagen2012-06-273-127/+112
| | | | | | | | | | | | | | | | | | | | | | | | instead of resolving them on-demand, just initialize the value hash with them. less magic and faster. Change-Id: I28cb6c21ae6ae60a33734f62acdef0794420ba8f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * don't make $$TEMPLATE_PREFIX available any moreOswald Buddenhagen2012-06-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | this is a purely internal variable. projects are supposed to query $$TEMPLATE only. Change-Id: I32a3aa7012a4fedcf6e77e2e1302ed978baac700 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * move initialization of numerous variables to spec_pre.prfOswald Buddenhagen2012-06-273-85/+53
| | | | | | | | | | | | | | | | | | | | | | | | this is cleaner by design and allows removing some hacks. Change-Id: I3270195b5d62caa476ffde7c1e1ef43cec99c565 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * remove QMAKE_EXT_H_MOC and QMAKE_CPP_MOD_MOC from OptionOswald Buddenhagen2012-06-272-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | these are not actually used inside qmake since ever the code was factored into moc.prf. Change-Id: I545f4857ca3f0b4bf2439703700069ac67ad4ca2 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * purge QMAKE_MOD_SYSTEM_ENV from Option & co.Oswald Buddenhagen2012-06-272-5/+0
| | | | | | | | | | | | | | | | | | | | | this is entirely unused Change-Id: Ia0368b1d90f61b64178e28479a2088a19aa418e3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * don't read QMAKE_DIRLIST_SEP back into Option::dirlist_sepOswald Buddenhagen2012-06-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | it's really only a host setting which is not used any more past the now removed assignment. Change-Id: I62c61c893697eb9a7e7be550311bf152d5a8206e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 12:21:45 +0000