summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Change default Content-Type for http POST to match 4.7.4Shane Kearns2012-06-211-2/+5
| | | | | | | | | | | | | | | Qt 4.7.3 sent no Content-Type header by default. This was fixed independently on 4.8.0 and 4.7.4 branches, with different defaults. Since this is often used for web service logins, the 4.7.4 default of x-www-form-urlencoded seems more likely to work. The warning message is left in place, since not specifying the content type is still an application bug. Task-number: QTBUG-23350 Change-Id: I30bf50fd216ee9894d0168e904cea1ed4251ec68 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Remove references to Q_WS_QWSGirish Ramakrishnan2012-06-206-47/+5
| | | | | | | | | | | | | Affected code includes: src/widgets/dialogs/qmessagebox.cpp src/widgets/graphicsview/qgraphicsitem.cpp src/widgets/kernel/qapplication_p.h src/widgets/kernel/qwhatsthis.cpp src/widgets/kernel/qwidget.h src/widgets/widgets/qdockwidget.cpp Change-Id: Ib9e920b3cc1253b39e4e00d7137c21321ecc0399 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* plastique: Use QPlatformTheme::DialogButtonBoxButtonsHaveIconsGirish Ramakrishnan2012-06-201-3/+6
| | | | | Change-Id: I2f493d45820063ef62f16febde0df89a874dddb0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove dead codeGirish Ramakrishnan2012-06-201-4/+0
| | | | | Change-Id: I48c1e3b2ebcf4ec2fb21ed2d1a88e1dae64e937d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix QWidgetWindow sending duplicate drag-drop eventsJames Turner2012-06-201-1/+1
| | | | | | | | | | Unlike the other event handlers in QWidgetWindow, the drag-drop events are not followed by an early return. This causes all drag-drop events to also be sent to the root widget of the window, which is a bug. For example in the fridgemagnets example, where the target widget and root widget are the same, the drop event is received twice. Change-Id: I99e56ad8c48b3d31b0bd7c815cea8490edbf0af4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Record if a metatype is a smart pointer to a QObject derived.Stephen Kelly2012-06-204-18/+66
| | | | | | | | | | | | This allows QVariant/QMetaType software (such as QtDeclarative) to deal with smart pointers in a similar way to how they can deal with naked pointers (accessing properties etc). This also adds a requirement that T be fully defined when QSharedPointer<T> is inserted into a QVariant. Change-Id: I29e12b8a6aa5f4aadbd62f92b89bc238f64b5725 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Add some internal API for extracting a QSharedPointer<T> from QVariant.Stephen Kelly2012-06-205-1/+155
| | | | | | | | | | | | | The T must be derived from QObject, or it will fail to compile. This will allow scripting or other 'wrapping' and runtime environments like QtDeclarative to handle QSharedPointers to types derived from QObject properly. A QSharedPointer<T> can be inserted into a QVariant, and where T derives from QObject, a QSharedPointer<QObject> can be extracted from the QVariant, and its properties are then accessible. Change-Id: I68d6d89aceceb019267bd7301baa2047f9c09b90 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNetworkAccessManager: delete the httpThreadMartin Petersson2012-06-202-4/+12
| | | | | | | | | | | | | The httpThread was using deleteLater the finished signal of the thread to call the deleteLater slot. If the QNetworkAccessManager is deleted when the application is closed then then fished is emitted but we never return to the eventloop so the deletion is never done. This will delete the httpThread directly instead of using deleteLater Task-number: QTBUG-25487 Change-Id: I1fdbd4eca01e8bd8b3a98936298e5c78217752b4 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Change *-clang mkspec globs to *-clang*Bradley T. Hughes2012-06-202-2/+2
| | | | | | | | Like with the numerous g++ mkspecs, we have mkspecs with suffixes, and these mkspecs should still match the clang globs. Change-Id: I9296408b5192bc72cc468d229a57923e3f5ab6f0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* mkspecs: Add macx-clang-libc++ and macx-clang-libc++-32Bradley T. Hughes2012-06-204-0/+129
| | | | | | | | | Use these mkspecs to switch to the new libc++ C++ runtime library, which in turn makes it possible to enable C++11 support with clang. Change-Id: If92908592f8bee4829a1bad747fe396f527d26c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix tst_QWidget::getSetCheck on WindowsJoerg Bornemann2012-06-201-1/+1
| | | | | Change-Id: Ie11a7576f8e618e2fedb31bd8071abb44b9f9f57 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix unused parameter warnings in moc test.Mitch Curtis2012-06-201-3/+3
| | | | | Change-Id: I3467a8bf99464c2d3762a171b20508bb4b29ddb4 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Make QUuid compile with QT_NO_QUUID_STRING without breaking QDebug <<Jeremy Katz2012-06-201-1/+6
| | | | | | | | | | | | | | Change I0cbb0581a1c3abefdde75b7cd45fdafd31640f0d breaks the use of operator<< for QDebug, which shows up when trying to link QtCore in the small qconfig. Instead, render QUuid as "QUuid(QT_NO_QUUID_STRING)". Task-number: QTBUG-24816 Change-Id: Ia52283d7461a9907bcec7a110e41c9f830895efe Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* define QT_NO_ICONV if QT_NO_TEXTCODECJeremy Katz2012-06-203-10/+29
| | | | | | | | | | | | This also updates qfeatures.h with various other things that have been neglected. Run $QTSRCDIR/util/scripts/make_qfeatures_dot_h after changing qfeatures.txt Task-number: QTBUG-24816 Change-Id: I18b71fcec71efa9cfe3425fb1a7833456ec411b9 Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make QVariant compile with QT_NO_QUUID_STRINGJeremy Katz2012-06-201-0/+4
| | | | | | | | Task-number: QTBUG-24816 Change-Id: I76e6a6bcf1a2381e14f400648e3cb8ba554772a6 Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Mac: Fix rendering of non-int sized fonts.Eike Ziller2012-06-202-17/+24
| | | | | | | | | Scrolling happens in integer steps, so it's necessary to use a fractional correction value. Task-number: QTCREATORBUG-7127 Change-Id: I6eccba6532f95aa4bf9270bdaec4b57280dc8e3d Reviewed-by: Matthias Ettrich <matthias.ettrich@nokia.com>
* Document and use UserEvent::nullWindow for event deliveryGirish Ramakrishnan2012-06-201-54/+61
| | | | | | | | | | | | | | | | | nullWindow is used to track if the window was null when the event was created. If the window was null at contruction time, the qpa event delivery code will choose a window to deliver it to. If the window was not-null at creation time but became null during the actuall event processing time, the event is ignored. All the event delivery except the touch event delivery has been changed to reflect this. I have not changed touch event delivery because I don't really know what all need to be retranslated into new window co-ordinates. Change-Id: Ic62d12a13e70dd4d01226509411817db1b6af108 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Merge "Merge branch 'buildsystem'" into refs/staging/masterOswald Buddenhagen2012-06-20176-2616/+2416
|\
| * Merge branch 'buildsystem'Oswald Buddenhagen2012-06-19176-2616/+2416
| |\ | | | | | | | | | | | | | | | | | | This appears to be fully backwards-compatible with all tested modules, as far as CI is concerned. Change-Id: I53f979d06d0a264c5aab1193bab181a38ab837d6
| | * Fixed Wince Makefile environmentBjoern Breitmeyer2012-06-197-6/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated the checksdk tool into qmake and made the makefiles selfcontained, so configure make, is now enough to build qt for wince Change-Id: I29076702eca2ec23d4d06bb3d5c5cef9d4f95161 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * make missing qt modules fatalOswald Buddenhagen2012-06-191-1/+3
| | | | | | | | | | | | | | | | | | | | | there is no point in continuing; it will error out later (in more cryptic ways) anyway. Change-Id: I2562eadc2d91bfaa6e85368dc3774da31409a141
| | * less confusing wordingOswald Buddenhagen2012-06-191-1/+1
| | | | | | | | | | | | Change-Id: Ia509fe1a28de803673623d425f5949b35404598c
| | * fix misnomer: qt_module.prf => qt_build_config.prfOswald Buddenhagen2012-06-1916-47/+49
| | | | | | | | | | | | | | | | | | qt_module suggests to be congruent to qt_plugin. Change-Id: I629530bcbe2ba6c0adbdc11a275119c8aff0c953
| | * fix regexp in qmodule.pri inclusion checkOswald Buddenhagen2012-06-192-3/+1
| | | | | | | | | | | | | | | | | | this also allows us removing the redundant flag variable Change-Id: If26d22280ce7bc2ef3514c7c11ce7cd9baec1293
| | * revamp automatic makefile generation for sub-projectsOswald Buddenhagen2012-06-194-33/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of making the "real" targets depend on the makefiles, add conditional makefile generation to the targets themselves. this causes makefile generation to follow the recursion order determined by the project, which is important when dealing with prl and module pri files. a side effect of this is that qmake and make calls are interleaved now, which is entirely different from a 'qmake -r' run. on the downside, calling make with multiple targets which operate on the same subprojects without prior makefile generation will make a mess, as the qmake calls will be racing. this should be no problem, as qmake does not generate recursive targets where this would be useful - at least by default. it is not sufficient to just order the creation of the makefiles non-recursively (e.g., by using gnu-specific order-only-prerequisites), as an interrupted and subsequently resumed build would happily skip the nested makefiles. workable alternative approaches would be walking the entire tree in a pre-pass to ensure makefile presence (which is incredibly slow) or creating additional stamp files only after recursing and having the makefiles depend on them (which is ugly). Task-number: QTBUG-23376 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Change-Id: I88d3e7610215677d362026de316513d3bea04b06
| | * support for private depends in modulesOswald Buddenhagen2012-06-193-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if a module's private headers add additional dependencies, QT_PRIVATE is now the place to declare them. note however, that this may not contain other private headers in turn - that would be much harder to implement, and we want the explicitness anyway. Change-Id: Ic516fcf1a003c95798df4fbe216f92016afaf47e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * introduce $$QMAKE_CHK_EXISTS_GLUEOswald Buddenhagen2012-06-194-7/+7
| | | | | | | | | | | | | | | | | | | | | instead of hard-coding platform differences, use a variable. Change-Id: I20e98811ad5f07429148c6f88aedbabc3ba58fff Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * centralize definitions of shell commandsOswald Buddenhagen2012-06-1966-622/+43
| | | | | | | | | | | | | | | | | | | | | there are only two types. everything else is duplication. Change-Id: I87f2bdd3d56b94bb2ecdb60e8861afeb9af3666f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * normalize $$QMAKE_QMAKEOswald Buddenhagen2012-06-193-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | everything in the projects should be normalized. only the makefile generators need to adjust it to the native form. Change-Id: I06a4e997f32134d13949ec4a9dd1b44367aab7cb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * correctly find idc even for makefilesOswald Buddenhagen2012-06-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | this is a qt tool, so it needs appropriate treatment Change-Id: I0cb30ba07e03c72ee275cd916ca0a39a99fc3705 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * fix in-/out-dir mixupOswald Buddenhagen2012-06-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | no point in entering the outdir and leaving the indir. this doesn't really matter except for the obsolete borland generator, but whatever. Change-Id: Ieb4e4c549ebd65f99e4d00819c52822968b060a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * remove unnecessary conditionalOswald Buddenhagen2012-06-191-6/+2
| | | | | | | | | | | | | | | | | | | | | the code above already deals with the differences Change-Id: Ifb799e46f5187e7bd3d0f0169e868ad267bcfe23 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * remove duplicate assignments of MKDIR & CHK_DIR_EXISTSOswald Buddenhagen2012-06-191-2/+0
| | | | | | | | | | | | | | | Change-Id: I314659a1ba25227380176dc65a9c81e3c6df28c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * unobfuscate makefiles re $(CHK_DIR_EXISTS)Oswald Buddenhagen2012-06-192-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | no need to define an obscure variable for it. just inline it. the assignments are left in for compatibility with hand-written commands. Change-Id: I9bc3914e2c4116f3b8fe00a421ca0f036bb7e214 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * make 'qmake_all' targets respect .depends and CONFIG+=orderedOswald Buddenhagen2012-06-191-0/+7
| | | | | | | | | | | | | | | | | | Change-Id: I010a9886ee0d40e4319cb6bd873b038336a42111 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * make 'qmake_all' target of SUBDIRS projects properly recursiveOswald Buddenhagen2012-06-192-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | so far it would rebuild the makefiles one level down only, which is somewhat arbitrary and not really helpful. Change-Id: I5fe01f379ecc4b210610a674d7df7dfc18131eef Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * make 'qmake' target of SUBDIRS projects non-recursiveOswald Buddenhagen2012-06-192-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | that's consistent with other projects. 'qmake_all' can be used for recursion. Change-Id: Ie6d620f7a3e0e28d3f2f82f01ca94c2f46137c68 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * don't use $(MAKEFILE) to refer to SUBDIRS' makefilesOswald Buddenhagen2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | $(MAKEFILE) is our own file, and using it would wreak havoc if it was named anything but Makefile. Change-Id: I51cae2014a85399b409f18788f864ff2a82e493e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * do not add "/." to _PRO_FILE_PWD_Oswald Buddenhagen2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | if a "subdir" project added a project file from the same directory as itself, "/." would be appended to the path, which is obviously not useful. Change-Id: Ia733dedb57e568c5cf9a3d5eb29727176a5142c5 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * don't refer to removed headersOswald Buddenhagen2012-06-191-1/+0
| | | | | | | | | | | | | | | Change-Id: Ib1d51f8fb6078c6ac365b455bde5bebf66b13b15 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * allow projects to suppress qmake recursionOswald Buddenhagen2012-06-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webkit does some unholy tricks with the ordering of qmake and make invocations, so it does not work with qmake -r. to make it still possible to integrate it into the qt5 aggregator project, give it a chance to "break out" from the recursion. Change-Id: I926836e44c0e0790cdd90e6b0c8f766dccc33c4d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * scan module path backwardsOswald Buddenhagen2012-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | the last read file wins, so reading in inverse order ensures that we respect the list's sorting by decreasing priority. Change-Id: I2e6539a52d4195ed6af4c0143b035c39577b8310 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * let default_pre add modules to the qmake pathOswald Buddenhagen2012-06-192-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that way qmake is made aware of the forwarding pris which are generated for this module even when a top-level .qmake.cache prevents the module's root from being found automatically. the path is also added to the cache, so that subsequent partial qmake-ing of the tree will still find the module. this also makes the -cache-module-fwd parameter of syncqt useless, so remove it. Change-Id: I2afbc52a465c0b3260e9bcaf032c43a82ae8061f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * recognize QMAKEMODULES env var, property and cache variableOswald Buddenhagen2012-06-191-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | the latter allows sub-projects to dynamically extend the qmake search path specifically for modules. the others are just for congruency with QMAKEPATH and QMAKEFEATURES. Change-Id: I0c099035f8dc8ee8645566dbc635644a15ed9da5 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * look for mkspecs/ even below .qmake.cache/.conf-determined rootOswald Buddenhagen2012-06-191-19/+26
| | | | | | | | | | | | | | | | | | | | | otherwise a cache/config in an aggregator project may unduly hide the mkspecs/ of the aggregated project from qmake's view. Change-Id: Idb0b124de071822f8f55463d9f8a4d194ef3130e
| | * add support for a super cacheOswald Buddenhagen2012-06-192-13/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake will now look for .qmake.super, just like it looks for .qmake.cache, and the cache() function has a mode to write this super cache. this allows the creation of aggregator projects like, say, qt5. a notable difference to the normal cache is that this file is *not* added as a dependency of the Makefile. this means that modifications done by later sub-projects will not cause a re-processing of earlier projects, and consequently that one should be cautious regarding what information to store there. another notable difference is that this file is read *before* the spec, so the spec can use the variables from the cache without resorting to $$fromfile() & co. Change-Id: I4807b6d34014261fa9eebd6f0ae128b802d86691 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * look for .qmake.conf filesOswald Buddenhagen2012-06-193-19/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | this is the source dir equivalent of .qmake.cache and can be checked into the repository. it can be used to make project-wide settings, or just to signal the presence of an mkspecs/ directory. Change-Id: I5f1cebad2aa2a89e78089341b2051613b6b7a613 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * find .qmake.cache for subprojects independentlyOswald Buddenhagen2012-06-193-41/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this allows the creation of aggregator projects, like, say, qt5. this is not expected to have a negative impact, as no project could reasonably expect a nested .qmake.cache to *not* take effect - in fact, if the project was processed stand-alone, it would already use it. Change-Id: I33f2935d309baba7e95465f2fefb8231c4f03eda Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * allow setting QMAKEPATH and QMAKEFEATURES in .qmake.cacheOswald Buddenhagen2012-06-191-0/+24
| | | | | | | | | | | | | | | Change-Id: Ie383abb57c06cb49d38345d64750837b8fe14c70 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * don't duplicate project_build_root's calculation needlesslyOswald Buddenhagen2012-06-191-7/+2
| | | | | | | | | | | | | | | Change-Id: Id2f343c450149b13b52c2cae8eb6eb4bfd73fc03 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 03:38:27 +0000