Mercurial > mxe-octave
annotate src/qt-1-cherrypicks.patch @ 1711:39f91df0fd34
package qt: fixed -enable-stdcall-fixup
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Sun, 27 Mar 2011 20:58:31 +0200 |
| parents | 81169b06f296 |
| children | 1a22655f516b |
| rev | line source |
|---|---|
| 1608 | 1 This file is part of mingw-cross-env. |
| 2 See doc/index.html for further information. | |
| 3 | |
| 4 Commits backported (cherry-picked) from Qt 4.7 branch. | |
| 5 http://qt.gitorious.org/qt | |
| 6 | |
| 7 From 8f36bff28b648f65845cd56255a6c5b2cb7f8e42 Mon Sep 17 00:00:00 2001 | |
| 8 From: Mark Brand <mabrand@mabrand.nl> | |
| 9 Date: Fri, 15 Oct 2010 14:56:03 +0200 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
10 Subject: [PATCH 01/14] removed obsolete -qt-gif configure option |
| 1608 | 11 |
| 12 Since "-system-gif" is not offered, offering "-qt-gif" is unnecessary | |
| 13 and perhaps misleading. By default the GIF handler is built from code | |
| 14 included with Qt, unless suppressed by "-no-gif". | |
| 15 | |
| 16 Merge-request: 859 | |
| 17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 18 (cherry picked from commit dfe9084344d73d59f4569c8be6104ce83ae0df95) | |
| 19 --- | |
| 20 configure | 7 ++----- | |
| 21 tools/configure/configureapp.cpp | 5 +---- | |
| 22 2 files changed, 3 insertions(+), 9 deletions(-) | |
| 23 | |
| 24 diff --git a/configure b/configure | |
| 25 index 7abe0eb..c159cd4 100755 | |
| 26 --- a/configure | |
| 27 +++ b/configure | |
| 28 @@ -1570,8 +1570,7 @@ while [ "$#" -gt 0 ]; do | |
| 29 fi | |
| 30 ;; | |
| 31 gif) | |
| 32 - [ "$VAL" = "qt" ] && VAL=auto | |
| 33 - if [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then | |
| 34 + if [ "$VAL" = "no" ]; then | |
| 35 CFG_GIF="$VAL" | |
| 36 else | |
| 37 UNKNOWN_OPT=yes | |
| 38 @@ -3544,7 +3543,7 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir | |
| 39 [-accessibility] [-no-stl] [-stl] [-no-sql-<driver>] [-sql-<driver>] | |
| 40 [-plugin-sql-<driver>] [-system-sqlite] [-no-qt3support] [-qt3support] | |
| 41 [-platform] [-D <string>] [-I <string>] [-L <string>] [-help] | |
| 42 - [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff] | |
| 43 + [-qt-zlib] [-system-zlib] [-no-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff] | |
| 44 [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng] | |
| 45 [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make <part>] | |
| 46 [-nomake <part>] [-R <string>] [-l <string>] [-no-rpath] [-rpath] [-continue] | |
| 47 @@ -3773,8 +3772,6 @@ Third Party Libraries: | |
| 48 See http://www.gzip.org/zlib | |
| 49 | |
| 50 -no-gif ............ Do not compile GIF reading support. | |
| 51 - * -qt-gif ............ Compile GIF reading support. | |
| 52 - See also src/gui/image/qgifhandler_p.h | |
| 53 | |
| 54 -no-libtiff ........ Do not compile TIFF support. | |
| 55 -qt-libtiff ........ Use the libtiff bundled with Qt. | |
| 56 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | |
| 57 index 15c0ddb..dd5647b 100644 | |
| 58 --- a/tools/configure/configureapp.cpp | |
| 59 +++ b/tools/configure/configureapp.cpp | |
| 60 @@ -590,8 +590,6 @@ void Configure::parseCmdLine() | |
| 61 // Image formats -------------------------------------------- | |
| 62 else if (configCmdLine.at(i) == "-no-gif") | |
| 63 dictionary[ "GIF" ] = "no"; | |
| 64 - else if (configCmdLine.at(i) == "-qt-gif") | |
| 65 - dictionary[ "GIF" ] = "plugin"; | |
| 66 | |
| 67 else if (configCmdLine.at(i) == "-no-libtiff") { | |
| 68 dictionary[ "TIFF"] = "no"; | |
| 69 @@ -1661,7 +1659,7 @@ bool Configure::displayHelp() | |
| 70 "[-no-qmake] [-qmake] [-dont-process] [-process]\n" | |
| 71 "[-no-style-<style>] [-qt-style-<style>] [-redo]\n" | |
| 72 "[-saveconfig <config>] [-loadconfig <config>]\n" | |
| 73 - "[-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libpng]\n" | |
| 74 + "[-qt-zlib] [-system-zlib] [-no-gif] [-no-libpng]\n" | |
| 75 "[-qt-libpng] [-system-libpng] [-no-libtiff] [-qt-libtiff]\n" | |
| 76 "[-system-libtiff] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg]\n" | |
| 77 "[-no-libmng] [-qt-libmng] [-system-libmng] [-no-qt3support] [-mmx]\n" | |
| 78 @@ -1794,7 +1792,6 @@ bool Configure::displayHelp() | |
| 79 desc("ZLIB", "system", "-system-zlib", "Use zlib from the operating system.\nSee http://www.gzip.org/zlib\n"); | |
| 80 | |
| 81 desc("GIF", "no", "-no-gif", "Do not compile GIF reading support."); | |
| 82 - desc("GIF", "auto", "-qt-gif", "Compile GIF reading support.\nSee also src/gui/image/qgifhandler_p.h\n"); | |
| 83 | |
| 84 desc("LIBPNG", "no", "-no-libpng", "Do not compile PNG support."); | |
| 85 desc("LIBPNG", "qt", "-qt-libpng", "Use the libpng bundled with Qt."); | |
| 86 -- | |
| 87 1.7.4.1 | |
| 88 | |
| 89 | |
| 90 From 6f97b6dab051bc2899907ac794495bc7542d4337 Mon Sep 17 00:00:00 2001 | |
| 91 From: Mark Brand <mabrand@mabrand.nl> | |
| 92 Date: Mon, 10 Jan 2011 16:41:54 +0100 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
93 Subject: [PATCH 02/14] qmake: fix double directory separator |
| 1608 | 94 |
| 95 Merge-request: 2543 | |
| 96 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 97 (cherry picked from commit 89886a34d7c4fdacc472f6e1498bc0769f2302ad) | |
| 98 --- | |
| 99 qmake/generators/unix/unixmake2.cpp | 9 +++++++-- | |
| 100 1 files changed, 7 insertions(+), 2 deletions(-) | |
| 101 | |
| 102 diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp | |
| 103 index df580fd..81a379f 100644 | |
| 104 --- a/qmake/generators/unix/unixmake2.cpp | |
| 105 +++ b/qmake/generators/unix/unixmake2.cpp | |
| 106 @@ -1345,8 +1345,13 @@ UnixMakefileGenerator::pkgConfigFileName(bool fixify) | |
| 107 if(dot != -1) | |
| 108 ret = ret.left(dot); | |
| 109 ret += Option::pkgcfg_ext; | |
| 110 - if(!project->isEmpty("QMAKE_PKGCONFIG_DESTDIR")) | |
| 111 - ret.prepend(project->first("QMAKE_PKGCONFIG_DESTDIR") + Option::dir_sep); | |
| 112 + QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR"); | |
| 113 + if(!subdir.isEmpty()) { | |
| 114 + // initOutPaths() appends dir_sep, but just to be safe.. | |
| 115 + if (!subdir.endsWith(Option::dir_sep)) | |
| 116 + ret.prepend(Option::dir_sep); | |
| 117 + ret.prepend(subdir); | |
| 118 + } | |
| 119 if(fixify) { | |
| 120 if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) | |
| 121 ret.prepend(project->first("DESTDIR")); | |
| 122 -- | |
| 123 1.7.4.1 | |
| 124 | |
| 125 | |
| 126 From da69fe08f058ac49788559d333bcec747b94d208 Mon Sep 17 00:00:00 2001 | |
| 127 From: Mark Brand <mabrand@mabrand.nl> | |
| 128 Date: Mon, 10 Jan 2011 16:41:55 +0100 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
129 Subject: [PATCH 03/14] qmake: don't limit pkg-config writing to unix generator |
| 1608 | 130 |
| 131 Move pkg-config related methods from unix generator to base class | |
| 132 so they can be used by other generators too. | |
| 133 | |
| 134 Merge-request: 2543 | |
| 135 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 136 (cherry picked from commit 95646b07968604aa69f7e367dab7c9966dc44772) | |
| 137 --- | |
| 138 qmake/generators/makefile.cpp | 178 +++++++++++++++++++++++++++++++++++ | |
| 139 qmake/generators/makefile.h | 5 + | |
| 140 qmake/generators/unix/unixmake.h | 4 - | |
| 141 qmake/generators/unix/unixmake2.cpp | 178 ----------------------------------- | |
| 142 4 files changed, 183 insertions(+), 182 deletions(-) | |
| 143 | |
| 144 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp | |
| 145 index 77b9979..d77f002 100644 | |
| 146 --- a/qmake/generators/makefile.cpp | |
| 147 +++ b/qmake/generators/makefile.cpp | |
| 148 @@ -3123,4 +3123,182 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const | |
| 149 return false; | |
| 150 } | |
| 151 | |
| 152 +QString | |
| 153 +MakefileGenerator::pkgConfigFileName(bool fixify) | |
| 154 +{ | |
| 155 + QString ret = var("TARGET"); | |
| 156 + int slsh = ret.lastIndexOf(Option::dir_sep); | |
| 157 + if(slsh != -1) | |
| 158 + ret = ret.right(ret.length() - slsh - 1); | |
| 159 + if(ret.startsWith("lib")) | |
| 160 + ret = ret.mid(3); | |
| 161 + int dot = ret.indexOf('.'); | |
| 162 + if(dot != -1) | |
| 163 + ret = ret.left(dot); | |
| 164 + ret += Option::pkgcfg_ext; | |
| 165 + QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR"); | |
| 166 + if(!subdir.isEmpty()) { | |
| 167 + // initOutPaths() appends dir_sep, but just to be safe.. | |
| 168 + if (!subdir.endsWith(Option::dir_sep)) | |
| 169 + ret.prepend(Option::dir_sep); | |
| 170 + ret.prepend(subdir); | |
| 171 + } | |
| 172 + if(fixify) { | |
| 173 + if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) | |
| 174 + ret.prepend(project->first("DESTDIR")); | |
| 175 + ret = Option::fixPathToLocalOS(fileFixify(ret, qmake_getpwd(), Option::output_dir)); | |
| 176 + } | |
| 177 + return ret; | |
| 178 +} | |
| 179 + | |
| 180 +QString | |
| 181 +MakefileGenerator::pkgConfigPrefix() const | |
| 182 +{ | |
| 183 + if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX")) | |
| 184 + return project->first("QMAKE_PKGCONFIG_PREFIX"); | |
| 185 + return QLibraryInfo::location(QLibraryInfo::PrefixPath); | |
| 186 +} | |
| 187 + | |
| 188 +QString | |
| 189 +MakefileGenerator::pkgConfigFixPath(QString path) const | |
| 190 +{ | |
| 191 + QString prefix = pkgConfigPrefix(); | |
| 192 + if(path.startsWith(prefix)) | |
| 193 + path = path.replace(prefix, "${prefix}"); | |
| 194 + return path; | |
| 195 +} | |
| 196 + | |
| 197 +void | |
| 198 +MakefileGenerator::writePkgConfigFile() | |
| 199 +{ | |
| 200 + QString fname = pkgConfigFileName(), lname = fname; | |
| 201 + mkdir(fileInfo(fname).path()); | |
| 202 + int slsh = lname.lastIndexOf(Option::dir_sep); | |
| 203 + if(slsh != -1) | |
| 204 + lname = lname.right(lname.length() - slsh - 1); | |
| 205 + QFile ft(fname); | |
| 206 + if(!ft.open(QIODevice::WriteOnly)) | |
| 207 + return; | |
| 208 + project->values("ALL_DEPS").append(fileFixify(fname)); | |
| 209 + QTextStream t(&ft); | |
| 210 + | |
| 211 + QString prefix = pkgConfigPrefix(); | |
| 212 + QString libDir = project->first("QMAKE_PKGCONFIG_LIBDIR"); | |
| 213 + if(libDir.isEmpty()) | |
| 214 + libDir = prefix + Option::dir_sep + "lib" + Option::dir_sep; | |
| 215 + QString includeDir = project->first("QMAKE_PKGCONFIG_INCDIR"); | |
| 216 + if(includeDir.isEmpty()) | |
| 217 + includeDir = prefix + "/include"; | |
| 218 + | |
| 219 + t << "prefix=" << prefix << endl; | |
| 220 + t << "exec_prefix=${prefix}\n" | |
| 221 + << "libdir=" << pkgConfigFixPath(libDir) << "\n" | |
| 222 + << "includedir=" << pkgConfigFixPath(includeDir) << endl; | |
| 223 + // non-standard entry. Provides useful info normally only | |
| 224 + // contained in the internal .qmake.cache file | |
| 225 + t << varGlue("CONFIG", "qt_config=", " ", "") << endl; | |
| 226 + | |
| 227 + //extra PKGCONFIG variables | |
| 228 + const QStringList &pkgconfig_vars = project->values("QMAKE_PKGCONFIG_VARIABLES"); | |
| 229 + for(int i = 0; i < pkgconfig_vars.size(); ++i) { | |
| 230 + QString var = project->first(pkgconfig_vars.at(i) + ".name"), | |
| 231 + val = project->values(pkgconfig_vars.at(i) + ".value").join(" "); | |
| 232 + if(var.isEmpty()) | |
| 233 + continue; | |
| 234 + if(val.isEmpty()) { | |
| 235 + const QStringList &var_vars = project->values(pkgconfig_vars.at(i) + ".variable"); | |
| 236 + for(int v = 0; v < var_vars.size(); ++v) { | |
| 237 + const QStringList &vars = project->values(var_vars.at(v)); | |
| 238 + for(int var = 0; var < vars.size(); ++var) { | |
| 239 + if(!val.isEmpty()) | |
| 240 + val += " "; | |
| 241 + val += pkgConfigFixPath(vars.at(var)); | |
| 242 + } | |
| 243 + } | |
| 244 + } | |
| 245 + t << var << "=" << val << endl; | |
| 246 + } | |
| 247 + | |
| 248 + t << endl; | |
| 249 + | |
| 250 + QString name = project->first("QMAKE_PKGCONFIG_NAME"); | |
| 251 + if(name.isEmpty()) { | |
| 252 + name = project->first("QMAKE_ORIG_TARGET").toLower(); | |
| 253 + name.replace(0, 1, name[0].toUpper()); | |
| 254 + } | |
| 255 + t << "Name: " << name << endl; | |
| 256 + QString desc = project->values("QMAKE_PKGCONFIG_DESCRIPTION").join(" "); | |
| 257 + if(desc.isEmpty()) { | |
| 258 + if(name.isEmpty()) { | |
| 259 + desc = project->first("QMAKE_ORIG_TARGET").toLower(); | |
| 260 + desc.replace(0, 1, desc[0].toUpper()); | |
| 261 + } else { | |
| 262 + desc = name; | |
| 263 + } | |
| 264 + if(project->first("TEMPLATE") == "lib") { | |
| 265 + if(project->isActiveConfig("plugin")) | |
| 266 + desc += " Plugin"; | |
| 267 + else | |
| 268 + desc += " Library"; | |
| 269 + } else if(project->first("TEMPLATE") == "app") { | |
| 270 + desc += " Application"; | |
| 271 + } | |
| 272 + } | |
| 273 + t << "Description: " << desc << endl; | |
| 274 + t << "Version: " << project->first("VERSION") << endl; | |
| 275 + | |
| 276 + // libs | |
| 277 + t << "Libs: "; | |
| 278 + QString pkgConfiglibDir; | |
| 279 + QString pkgConfiglibName; | |
| 280 + if (Option::target_mode == Option::TARG_MACX_MODE && project->isActiveConfig("lib_bundle")) { | |
| 281 + pkgConfiglibDir = "-F${libdir}"; | |
| 282 + QString bundle; | |
| 283 + if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME")) | |
| 284 + bundle = unescapeFilePath(project->first("QMAKE_FRAMEWORK_BUNDLE_NAME")); | |
| 285 + else | |
| 286 + bundle = unescapeFilePath(project->first("TARGET")); | |
| 287 + int suffix = bundle.lastIndexOf(".framework"); | |
| 288 + if (suffix != -1) | |
| 289 + bundle = bundle.left(suffix); | |
| 290 + pkgConfiglibName = "-framework " + bundle + " "; | |
| 291 + } else { | |
| 292 + pkgConfiglibDir = "-L${libdir}"; | |
| 293 + pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length()); | |
| 294 + } | |
| 295 + t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl; | |
| 296 + | |
| 297 + QStringList libs; | |
| 298 + if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) { | |
| 299 + libs = project->values("QMAKE_INTERNAL_PRL_LIBS"); | |
| 300 + } else { | |
| 301 + libs << "QMAKE_LIBS"; //obvious one | |
| 302 + } | |
| 303 + libs << "QMAKE_LIBS_PRIVATE"; | |
| 304 + libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread? | |
| 305 + t << "Libs.private: "; | |
| 306 + for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) { | |
| 307 + t << project->values((*it)).join(" ") << " "; | |
| 308 + } | |
| 309 + t << endl; | |
| 310 + | |
| 311 + // flags | |
| 312 + // ### too many | |
| 313 + t << "Cflags: " | |
| 314 + // << var("QMAKE_CXXFLAGS") << " " | |
| 315 + << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ") | |
| 316 + << project->values("PRL_EXPORT_CXXFLAGS").join(" ") | |
| 317 + << project->values("QMAKE_PKGCONFIG_CFLAGS").join(" ") | |
| 318 + // << varGlue("DEFINES","-D"," -D"," ") | |
| 319 + << " -I${includedir}" << endl; | |
| 320 + | |
| 321 + // requires | |
| 322 + const QString requires = project->values("QMAKE_PKGCONFIG_REQUIRES").join(" "); | |
| 323 + if (!requires.isEmpty()) { | |
| 324 + t << "Requires: " << requires << endl; | |
| 325 + } | |
| 326 + | |
| 327 + t << endl; | |
| 328 +} | |
| 329 + | |
| 330 QT_END_NAMESPACE | |
| 331 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h | |
| 332 index b674a44..9b5b4a3 100644 | |
| 333 --- a/qmake/generators/makefile.h | |
| 334 +++ b/qmake/generators/makefile.h | |
| 335 @@ -105,6 +105,11 @@ protected: | |
| 336 virtual bool writeStubMakefile(QTextStream &t); | |
| 337 virtual bool writeMakefile(QTextStream &t); | |
| 338 | |
| 339 + QString pkgConfigPrefix() const; | |
| 340 + QString pkgConfigFileName(bool fixify=true); | |
| 341 + QString pkgConfigFixPath(QString) const; | |
| 342 + void writePkgConfigFile(); // for pkg-config | |
| 343 + | |
| 344 //generating subtarget makefiles | |
| 345 struct SubTarget | |
| 346 { | |
| 347 diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h | |
| 348 index ad54833..b28da82 100644 | |
| 349 --- a/qmake/generators/unix/unixmake.h | |
| 350 +++ b/qmake/generators/unix/unixmake.h | |
| 351 @@ -51,10 +51,6 @@ class UnixMakefileGenerator : public MakefileGenerator | |
| 352 bool init_flag, include_deps; | |
| 353 QString libtoolFileName(bool fixify=true); | |
| 354 void writeLibtoolFile(); // for libtool | |
| 355 - QString pkgConfigPrefix() const; | |
| 356 - QString pkgConfigFileName(bool fixify=true); | |
| 357 - QString pkgConfigFixPath(QString) const; | |
| 358 - void writePkgConfigFile(); // for pkg-config | |
| 359 void writePrlFile(QTextStream &); | |
| 360 | |
| 361 public: | |
| 362 diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp | |
| 363 index 81a379f..1846d56 100644 | |
| 364 --- a/qmake/generators/unix/unixmake2.cpp | |
| 365 +++ b/qmake/generators/unix/unixmake2.cpp | |
| 366 @@ -1332,182 +1332,4 @@ UnixMakefileGenerator::writeLibtoolFile() | |
| 367 "libdir='" << Option::fixPathToTargetOS(install_dir, false) << "'\n"; | |
| 368 } | |
| 369 | |
| 370 -QString | |
| 371 -UnixMakefileGenerator::pkgConfigFileName(bool fixify) | |
| 372 -{ | |
| 373 - QString ret = var("TARGET"); | |
| 374 - int slsh = ret.lastIndexOf(Option::dir_sep); | |
| 375 - if(slsh != -1) | |
| 376 - ret = ret.right(ret.length() - slsh - 1); | |
| 377 - if(ret.startsWith("lib")) | |
| 378 - ret = ret.mid(3); | |
| 379 - int dot = ret.indexOf('.'); | |
| 380 - if(dot != -1) | |
| 381 - ret = ret.left(dot); | |
| 382 - ret += Option::pkgcfg_ext; | |
| 383 - QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR"); | |
| 384 - if(!subdir.isEmpty()) { | |
| 385 - // initOutPaths() appends dir_sep, but just to be safe.. | |
| 386 - if (!subdir.endsWith(Option::dir_sep)) | |
| 387 - ret.prepend(Option::dir_sep); | |
| 388 - ret.prepend(subdir); | |
| 389 - } | |
| 390 - if(fixify) { | |
| 391 - if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) | |
| 392 - ret.prepend(project->first("DESTDIR")); | |
| 393 - ret = Option::fixPathToLocalOS(fileFixify(ret, qmake_getpwd(), Option::output_dir)); | |
| 394 - } | |
| 395 - return ret; | |
| 396 -} | |
| 397 - | |
| 398 -QString | |
| 399 -UnixMakefileGenerator::pkgConfigPrefix() const | |
| 400 -{ | |
| 401 - if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX")) | |
| 402 - return project->first("QMAKE_PKGCONFIG_PREFIX"); | |
| 403 - return QLibraryInfo::location(QLibraryInfo::PrefixPath); | |
| 404 -} | |
| 405 - | |
| 406 -QString | |
| 407 -UnixMakefileGenerator::pkgConfigFixPath(QString path) const | |
| 408 -{ | |
| 409 - QString prefix = pkgConfigPrefix(); | |
| 410 - if(path.startsWith(prefix)) | |
| 411 - path = path.replace(prefix, "${prefix}"); | |
| 412 - return path; | |
| 413 -} | |
| 414 - | |
| 415 -void | |
| 416 -UnixMakefileGenerator::writePkgConfigFile() | |
| 417 -{ | |
| 418 - QString fname = pkgConfigFileName(), lname = fname; | |
| 419 - mkdir(fileInfo(fname).path()); | |
| 420 - int slsh = lname.lastIndexOf(Option::dir_sep); | |
| 421 - if(slsh != -1) | |
| 422 - lname = lname.right(lname.length() - slsh - 1); | |
| 423 - QFile ft(fname); | |
| 424 - if(!ft.open(QIODevice::WriteOnly)) | |
| 425 - return; | |
| 426 - project->values("ALL_DEPS").append(fileFixify(fname)); | |
| 427 - QTextStream t(&ft); | |
| 428 - | |
| 429 - QString prefix = pkgConfigPrefix(); | |
| 430 - QString libDir = project->first("QMAKE_PKGCONFIG_LIBDIR"); | |
| 431 - if(libDir.isEmpty()) | |
| 432 - libDir = prefix + Option::dir_sep + "lib" + Option::dir_sep; | |
| 433 - QString includeDir = project->first("QMAKE_PKGCONFIG_INCDIR"); | |
| 434 - if(includeDir.isEmpty()) | |
| 435 - includeDir = prefix + "/include"; | |
| 436 - | |
| 437 - t << "prefix=" << prefix << endl; | |
| 438 - t << "exec_prefix=${prefix}\n" | |
| 439 - << "libdir=" << pkgConfigFixPath(libDir) << "\n" | |
| 440 - << "includedir=" << pkgConfigFixPath(includeDir) << endl; | |
| 441 - // non-standard entry. Provides useful info normally only | |
| 442 - // contained in the internal .qmake.cache file | |
| 443 - t << varGlue("CONFIG", "qt_config=", " ", "") << endl; | |
| 444 - | |
| 445 - //extra PKGCONFIG variables | |
| 446 - const QStringList &pkgconfig_vars = project->values("QMAKE_PKGCONFIG_VARIABLES"); | |
| 447 - for(int i = 0; i < pkgconfig_vars.size(); ++i) { | |
| 448 - QString var = project->first(pkgconfig_vars.at(i) + ".name"), | |
| 449 - val = project->values(pkgconfig_vars.at(i) + ".value").join(" "); | |
| 450 - if(var.isEmpty()) | |
| 451 - continue; | |
| 452 - if(val.isEmpty()) { | |
| 453 - const QStringList &var_vars = project->values(pkgconfig_vars.at(i) + ".variable"); | |
| 454 - for(int v = 0; v < var_vars.size(); ++v) { | |
| 455 - const QStringList &vars = project->values(var_vars.at(v)); | |
| 456 - for(int var = 0; var < vars.size(); ++var) { | |
| 457 - if(!val.isEmpty()) | |
| 458 - val += " "; | |
| 459 - val += pkgConfigFixPath(vars.at(var)); | |
| 460 - } | |
| 461 - } | |
| 462 - } | |
| 463 - t << var << "=" << val << endl; | |
| 464 - } | |
| 465 - | |
| 466 - t << endl; | |
| 467 - | |
| 468 - QString name = project->first("QMAKE_PKGCONFIG_NAME"); | |
| 469 - if(name.isEmpty()) { | |
| 470 - name = project->first("QMAKE_ORIG_TARGET").toLower(); | |
| 471 - name.replace(0, 1, name[0].toUpper()); | |
| 472 - } | |
| 473 - t << "Name: " << name << endl; | |
| 474 - QString desc = project->values("QMAKE_PKGCONFIG_DESCRIPTION").join(" "); | |
| 475 - if(desc.isEmpty()) { | |
| 476 - if(name.isEmpty()) { | |
| 477 - desc = project->first("QMAKE_ORIG_TARGET").toLower(); | |
| 478 - desc.replace(0, 1, desc[0].toUpper()); | |
| 479 - } else { | |
| 480 - desc = name; | |
| 481 - } | |
| 482 - if(project->first("TEMPLATE") == "lib") { | |
| 483 - if(project->isActiveConfig("plugin")) | |
| 484 - desc += " Plugin"; | |
| 485 - else | |
| 486 - desc += " Library"; | |
| 487 - } else if(project->first("TEMPLATE") == "app") { | |
| 488 - desc += " Application"; | |
| 489 - } | |
| 490 - } | |
| 491 - t << "Description: " << desc << endl; | |
| 492 - t << "Version: " << project->first("VERSION") << endl; | |
| 493 - | |
| 494 - // libs | |
| 495 - t << "Libs: "; | |
| 496 - QString pkgConfiglibDir; | |
| 497 - QString pkgConfiglibName; | |
| 498 - if (Option::target_mode == Option::TARG_MACX_MODE && project->isActiveConfig("lib_bundle")) { | |
| 499 - pkgConfiglibDir = "-F${libdir}"; | |
| 500 - QString bundle; | |
| 501 - if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME")) | |
| 502 - bundle = unescapeFilePath(project->first("QMAKE_FRAMEWORK_BUNDLE_NAME")); | |
| 503 - else | |
| 504 - bundle = unescapeFilePath(project->first("TARGET")); | |
| 505 - int suffix = bundle.lastIndexOf(".framework"); | |
| 506 - if (suffix != -1) | |
| 507 - bundle = bundle.left(suffix); | |
| 508 - pkgConfiglibName = "-framework " + bundle + " "; | |
| 509 - } else { | |
| 510 - pkgConfiglibDir = "-L${libdir}"; | |
| 511 - pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length()); | |
| 512 - } | |
| 513 - t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl; | |
| 514 - | |
| 515 - QStringList libs; | |
| 516 - if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) { | |
| 517 - libs = project->values("QMAKE_INTERNAL_PRL_LIBS"); | |
| 518 - } else { | |
| 519 - libs << "QMAKE_LIBS"; //obvious one | |
| 520 - } | |
| 521 - libs << "QMAKE_LIBS_PRIVATE"; | |
| 522 - libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread? | |
| 523 - t << "Libs.private: "; | |
| 524 - for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) { | |
| 525 - t << project->values((*it)).join(" ") << " "; | |
| 526 - } | |
| 527 - t << endl; | |
| 528 - | |
| 529 - // flags | |
| 530 - // ### too many | |
| 531 - t << "Cflags: " | |
| 532 - // << var("QMAKE_CXXFLAGS") << " " | |
| 533 - << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ") | |
| 534 - << project->values("PRL_EXPORT_CXXFLAGS").join(" ") | |
| 535 - << project->values("QMAKE_PKGCONFIG_CFLAGS").join(" ") | |
| 536 - // << varGlue("DEFINES","-D"," -D"," ") | |
| 537 - << " -I${includedir}" << endl; | |
| 538 - | |
| 539 - // requires | |
| 540 - const QString requires = project->values("QMAKE_PKGCONFIG_REQUIRES").join(" "); | |
| 541 - if (!requires.isEmpty()) { | |
| 542 - t << "Requires: " << requires << endl; | |
| 543 - } | |
| 544 - | |
| 545 - t << endl; | |
| 546 -} | |
| 547 - | |
| 548 QT_END_NAMESPACE | |
| 549 -- | |
| 550 1.7.4.1 | |
| 551 | |
| 552 | |
| 553 From c870095011276897127ed801570d0b4cce79d552 Mon Sep 17 00:00:00 2001 | |
| 554 From: Mark Brand <mabrand@mabrand.nl> | |
| 555 Date: Mon, 10 Jan 2011 16:41:56 +0100 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
556 Subject: [PATCH 04/14] qmake: write and install pkg-config files for mingw |
| 1608 | 557 |
| 558 Merge-request: 2543 | |
| 559 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 560 (cherry picked from commit f18aca79a233c71f7a4bc72c9e31de948ba43c31) | |
| 561 --- | |
| 562 qmake/generators/win32/mingw_make.cpp | 3 +++ | |
| 563 qmake/generators/win32/winmakefile.cpp | 12 ++++++++++++ | |
| 564 2 files changed, 15 insertions(+), 0 deletions(-) | |
| 565 | |
| 566 diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp | |
| 567 index 3202cb8..492b584 100644 | |
| 568 --- a/qmake/generators/win32/mingw_make.cpp | |
| 569 +++ b/qmake/generators/win32/mingw_make.cpp | |
| 570 @@ -142,6 +142,9 @@ bool MingwMakefileGenerator::writeMakefile(QTextStream &t) | |
| 571 | |
| 572 if(project->first("TEMPLATE") == "app" || | |
| 573 project->first("TEMPLATE") == "lib") { | |
| 574 + if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib") | |
| 575 + writePkgConfigFile(); | |
| 576 + | |
| 577 if(Option::mkfile::do_stub_makefile) { | |
| 578 t << "QMAKE = " << var("QMAKE_QMAKE") << endl; | |
| 579 QStringList &qut = project->values("QMAKE_EXTRA_TARGETS"); | |
| 580 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp | |
| 581 index 8af7ddd..6d0a5c4 100644 | |
| 582 --- a/qmake/generators/win32/winmakefile.cpp | |
| 583 +++ b/qmake/generators/win32/winmakefile.cpp | |
| 584 @@ -803,6 +803,18 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) | |
| 585 uninst.append("\n\t"); | |
| 586 uninst.append("-$(DEL_FILE) \"" + dst_prl + "\""); | |
| 587 } | |
| 588 + if(project->isActiveConfig("create_pc")) { | |
| 589 + QString dst_pc = pkgConfigFileName(false); | |
| 590 + if (!dst_pc.isEmpty()) { | |
| 591 + dst_pc = filePrefixRoot(root, targetdir + dst_pc); | |
| 592 + if(!ret.isEmpty()) | |
| 593 + ret += "\n\t"; | |
| 594 + ret += "-$(INSTALL_FILE) \"" + pkgConfigFileName(true) + "\" \"" + dst_pc + "\""; | |
| 595 + if(!uninst.isEmpty()) | |
| 596 + uninst.append("\n\t"); | |
| 597 + uninst.append("-$(DEL_FILE) \"" + dst_pc + "\""); | |
| 598 + } | |
| 599 + } | |
| 600 if(project->isActiveConfig("shared") && !project->isActiveConfig("plugin")) { | |
| 601 QString lib_target = getLibTarget(); | |
| 602 lib_target.remove('"'); | |
| 603 -- | |
| 604 1.7.4.1 | |
| 605 | |
| 606 | |
| 607 From 8414d5630e66546be5d5eb0e832c80dcddea5d77 Mon Sep 17 00:00:00 2001 | |
| 608 From: Mark Brand <mabrand@mabrand.nl> | |
| 609 Date: Mon, 10 Jan 2011 16:41:57 +0100 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
610 Subject: [PATCH 05/14] qt project files: create pkg-config files for mingw |
| 1608 | 611 |
| 612 This is mostly the same as for unix. | |
| 613 | |
| 614 Merge-request: 2543 | |
| 615 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 616 (cherry picked from commit 45fe2dddc3a0677b9ec9fce09f07cd4129e37afa) | |
| 617 --- | |
| 618 src/3rdparty/webkit/WebCore/WebCore.pro | 4 +--- | |
| 619 src/dbus/dbus.pro | 2 +- | |
| 620 src/declarative/declarative.pro | 2 +- | |
| 621 src/gui/gui.pro | 2 +- | |
| 622 src/multimedia/multimedia.pro | 2 +- | |
| 623 src/network/network.pro | 2 +- | |
| 624 src/opengl/opengl.pro | 2 +- | |
| 625 src/openvg/openvg.pro | 2 +- | |
| 626 src/phonon/phonon.pro | 2 +- | |
| 627 src/qbase.pri | 8 ++++++++ | |
| 628 src/qt3support/qt3support.pro | 2 +- | |
| 629 src/script/script.pro | 2 +- | |
| 630 src/scripttools/scripttools.pro | 2 +- | |
| 631 src/sql/sql.pro | 2 +- | |
| 632 src/svg/svg.pro | 2 +- | |
| 633 src/xml/xml.pro | 2 +- | |
| 634 src/xmlpatterns/xmlpatterns.pro | 2 +- | |
| 635 .../lib/fulltextsearch/fulltextsearch.pro | 2 +- | |
| 636 tools/assistant/lib/lib.pro | 2 +- | |
| 637 tools/designer/src/components/lib/lib.pro | 2 +- | |
| 638 tools/designer/src/lib/lib.pro | 2 +- | |
| 639 tools/designer/src/uitools/uitools.pro | 2 +- | |
| 640 22 files changed, 29 insertions(+), 23 deletions(-) | |
| 641 | |
| 642 diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro | |
| 643 index 37d216d..008bef7 100644 | |
| 644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro | |
| 645 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro | |
| 646 @@ -85,9 +85,7 @@ moduleFile=$$PWD/../WebKit/qt/qt_webkit_version.pri | |
| 647 isEmpty(QT_BUILD_TREE):include($$moduleFile) | |
| 648 VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION} | |
| 649 | |
| 650 -unix { | |
| 651 - QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork | |
| 652 -} | |
| 653 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork | |
| 654 | |
| 655 unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections | |
| 656 unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections | |
| 657 diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro | |
| 658 index 46a723a..52ed217 100644 | |
| 659 --- a/src/dbus/dbus.pro | |
| 660 +++ b/src/dbus/dbus.pro | |
| 661 @@ -12,7 +12,7 @@ contains(QT_CONFIG, dbus-linked) { | |
| 662 } | |
| 663 | |
| 664 # INCLUDEPATH += . | |
| 665 -unix { | |
| 666 +unix|win32-g++* { | |
| 667 QMAKE_PKGCONFIG_DESCRIPTION = Qt \ | |
| 668 DBus \ | |
| 669 module | |
| 670 diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro | |
| 671 index 1ad888b..4ed4f9f 100644 | |
| 672 --- a/src/declarative/declarative.pro | |
| 673 +++ b/src/declarative/declarative.pro | |
| 674 @@ -6,7 +6,7 @@ DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING | |
| 675 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 | |
| 676 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 | |
| 677 | |
| 678 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui | |
| 679 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui | |
| 680 | |
| 681 exists("qdeclarative_enable_gcov") { | |
| 682 QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors | |
| 683 diff --git a/src/gui/gui.pro b/src/gui/gui.pro | |
| 684 index 4d51fa8..05d961c 100644 | |
| 685 --- a/src/gui/gui.pro | |
| 686 +++ b/src/gui/gui.pro | |
| 687 @@ -7,7 +7,7 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused | |
| 688 | |
| 689 !win32:!embedded:!mac:!symbian:CONFIG += x11 | |
| 690 | |
| 691 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 692 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 693 | |
| 694 include(../qbase.pri) | |
| 695 | |
| 696 diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro | |
| 697 index 852322d..e827cdd 100644 | |
| 698 --- a/src/multimedia/multimedia.pro | |
| 699 +++ b/src/multimedia/multimedia.pro | |
| 700 @@ -4,7 +4,7 @@ QT = core gui | |
| 701 | |
| 702 DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE | |
| 703 | |
| 704 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui | |
| 705 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui | |
| 706 | |
| 707 include(../qbase.pri) | |
| 708 | |
| 709 diff --git a/src/network/network.pro b/src/network/network.pro | |
| 710 index 7ed7d3a..948922b 100644 | |
| 711 --- a/src/network/network.pro | |
| 712 +++ b/src/network/network.pro | |
| 713 @@ -13,7 +13,7 @@ DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE | |
| 714 QT = core | |
| 715 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000 | |
| 716 | |
| 717 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 718 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 719 | |
| 720 include(../qbase.pri) | |
| 721 include(access/access.pri) | |
| 722 diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro | |
| 723 index 0e82467..d467148 100644 | |
| 724 --- a/src/opengl/opengl.pro | |
| 725 +++ b/src/opengl/opengl.pro | |
| 726 @@ -7,7 +7,7 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000 | |
| 727 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 | |
| 728 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused | |
| 729 | |
| 730 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui | |
| 731 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui | |
| 732 | |
| 733 include(../qbase.pri) | |
| 734 | |
| 735 diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro | |
| 736 index c05af90..e7ed890 100644 | |
| 737 --- a/src/openvg/openvg.pro | |
| 738 +++ b/src/openvg/openvg.pro | |
| 739 @@ -42,7 +42,7 @@ symbian { | |
| 740 | |
| 741 include(../qbase.pri) | |
| 742 | |
| 743 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui | |
| 744 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui | |
| 745 symbian:TARGET.UID3 = 0x2001E62F | |
| 746 | |
| 747 !isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG | |
| 748 diff --git a/src/phonon/phonon.pro b/src/phonon/phonon.pro | |
| 749 index 7f79d0b..b16c5a1 100644 | |
| 750 --- a/src/phonon/phonon.pro | |
| 751 +++ b/src/phonon/phonon.pro | |
| 752 @@ -11,7 +11,7 @@ DEFINES += MAKE_PHONON_LIB | |
| 753 | |
| 754 PHONON_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/phonon | |
| 755 | |
| 756 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork | |
| 757 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork | |
| 758 | |
| 759 # Input | |
| 760 HEADERS += $$PHONON_DIR/abstractaudiooutput.h \ | |
| 761 diff --git a/src/qbase.pri b/src/qbase.pri | |
| 762 index 75da3dc..b50f9c6 100644 | |
| 763 --- a/src/qbase.pri | |
| 764 +++ b/src/qbase.pri | |
| 765 @@ -152,6 +152,14 @@ unix:!symbian { | |
| 766 QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace | |
| 767 } | |
| 768 | |
| 769 +win32-g++* { | |
| 770 + CONFIG += create_pc | |
| 771 + QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] | |
| 772 + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET | |
| 773 + QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS] | |
| 774 + QMAKE_PKGCONFIG_DESTDIR = pkgconfig | |
| 775 +} | |
| 776 + | |
| 777 contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE | |
| 778 DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS | |
| 779 contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT | |
| 780 diff --git a/src/qt3support/qt3support.pro b/src/qt3support/qt3support.pro | |
| 781 index a30117c..1e0717d 100644 | |
| 782 --- a/src/qt3support/qt3support.pro | |
| 783 +++ b/src/qt3support/qt3support.pro | |
| 784 @@ -21,7 +21,7 @@ include(canvas/canvas.pri) | |
| 785 include(network/network.pri) | |
| 786 include(painting/painting.pri) | |
| 787 | |
| 788 -unix { | |
| 789 +unix|win32-g++* { | |
| 790 QMAKE_PKGCONFIG_CFLAGS += -DQT3_SUPPORT | |
| 791 QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork QtSql | |
| 792 } | |
| 793 diff --git a/src/script/script.pro b/src/script/script.pro | |
| 794 index 63917b1..b5a2e70 100644 | |
| 795 --- a/src/script/script.pro | |
| 796 +++ b/src/script/script.pro | |
| 797 @@ -7,7 +7,7 @@ DEFINES += QT_NO_USING_NAMESPACE | |
| 798 DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO | |
| 799 #win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 ### FIXME | |
| 800 | |
| 801 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 802 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 803 | |
| 804 include(../qbase.pri) | |
| 805 | |
| 806 diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro | |
| 807 index b1df7aa..061dea5 100644 | |
| 808 --- a/src/scripttools/scripttools.pro | |
| 809 +++ b/src/scripttools/scripttools.pro | |
| 810 @@ -5,7 +5,7 @@ DEFINES += QT_BUILD_SCRIPTTOOLS_LIB | |
| 811 DEFINES += QT_NO_USING_NAMESPACE | |
| 812 #win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 | |
| 813 | |
| 814 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript | |
| 815 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript | |
| 816 | |
| 817 include(../qbase.pri) | |
| 818 | |
| 819 diff --git a/src/sql/sql.pro b/src/sql/sql.pro | |
| 820 index a02b0f4..81aa3c0 100644 | |
| 821 --- a/src/sql/sql.pro | |
| 822 +++ b/src/sql/sql.pro | |
| 823 @@ -5,7 +5,7 @@ DEFINES += QT_BUILD_SQL_LIB | |
| 824 DEFINES += QT_NO_USING_NAMESPACE | |
| 825 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000 | |
| 826 | |
| 827 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 828 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 829 | |
| 830 include(../qbase.pri) | |
| 831 | |
| 832 diff --git a/src/svg/svg.pro b/src/svg/svg.pro | |
| 833 index 7b5251a..79f284a 100644 | |
| 834 --- a/src/svg/svg.pro | |
| 835 +++ b/src/svg/svg.pro | |
| 836 @@ -6,7 +6,7 @@ DEFINES += QT_NO_USING_NAMESPACE | |
| 837 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 | |
| 838 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 | |
| 839 | |
| 840 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui | |
| 841 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui | |
| 842 | |
| 843 include(../qbase.pri) | |
| 844 | |
| 845 diff --git a/src/xml/xml.pro b/src/xml/xml.pro | |
| 846 index 8d1bf68..019153c 100644 | |
| 847 --- a/src/xml/xml.pro | |
| 848 +++ b/src/xml/xml.pro | |
| 849 @@ -4,7 +4,7 @@ QT = core | |
| 850 DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE | |
| 851 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 | |
| 852 | |
| 853 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 854 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 855 | |
| 856 include(../qbase.pri) | |
| 857 | |
| 858 diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro | |
| 859 index e50d184..d22f417 100644 | |
| 860 --- a/src/xmlpatterns/xmlpatterns.pro | |
| 861 +++ b/src/xmlpatterns/xmlpatterns.pro | |
| 862 @@ -5,7 +5,7 @@ QT = core \ | |
| 863 DEFINES += QT_BUILD_XMLPATTERNS_LIB \ | |
| 864 QT_NO_USING_NAMESPACE | |
| 865 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 | |
| 866 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore \ | |
| 867 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \ | |
| 868 QtNetwork | |
| 869 include(../qbase.pri) | |
| 870 PRECOMPILED_HEADER = ../corelib/global/qt_pch.h | |
| 871 diff --git a/tools/assistant/lib/fulltextsearch/fulltextsearch.pro b/tools/assistant/lib/fulltextsearch/fulltextsearch.pro | |
| 872 index 4d2fddb..d0e7a87 100644 | |
| 873 --- a/tools/assistant/lib/fulltextsearch/fulltextsearch.pro | |
| 874 +++ b/tools/assistant/lib/fulltextsearch/fulltextsearch.pro | |
| 875 @@ -23,7 +23,7 @@ contains(QT_CONFIG, reduce_exports) { | |
| 876 linux*-g++*:DEFINES += _GLIBCXX_EXTERN_TEMPLATE=0 | |
| 877 } | |
| 878 | |
| 879 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 880 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore | |
| 881 | |
| 882 # impossible to disable exceptions in clucene atm | |
| 883 CONFIG(exceptions_off) { | |
| 884 diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro | |
| 885 index 26d3456..03821b2 100644 | |
| 886 --- a/tools/assistant/lib/lib.pro | |
| 887 +++ b/tools/assistant/lib/lib.pro | |
| 888 @@ -19,7 +19,7 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { | |
| 889 win32:qclucene = $${qclucene}d | |
| 890 } | |
| 891 linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene | |
| 892 -unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \ | |
| 893 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \ | |
| 894 QtSql \ | |
| 895 QtXml | |
| 896 LIBS_PRIVATE += -l$$qclucene | |
| 897 diff --git a/tools/designer/src/components/lib/lib.pro b/tools/designer/src/components/lib/lib.pro | |
| 898 index 0ada845..50a8b00 100644 | |
| 899 --- a/tools/designer/src/components/lib/lib.pro | |
| 900 +++ b/tools/designer/src/components/lib/lib.pro | |
| 901 @@ -64,7 +64,7 @@ PRECOMPILED_HEADER= lib_pch.h | |
| 902 include(../../sharedcomponents.pri) | |
| 903 include(../component.pri) | |
| 904 | |
| 905 -unix { | |
| 906 +unix|win32-g++* { | |
| 907 QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml | |
| 908 contains(QT_CONFIG, script): QMAKE_PKGCONFIG_REQUIRES += QtScript | |
| 909 } | |
| 910 diff --git a/tools/designer/src/lib/lib.pro b/tools/designer/src/lib/lib.pro | |
| 911 index 495976d..3ba6f52 100644 | |
| 912 --- a/tools/designer/src/lib/lib.pro | |
| 913 +++ b/tools/designer/src/lib/lib.pro | |
| 914 @@ -13,7 +13,7 @@ isEmpty(QT_MAJOR_VERSION) { | |
| 915 VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} | |
| 916 } | |
| 917 | |
| 918 -unix:QMAKE_PKGCONFIG_REQUIRES += QtXml | |
| 919 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml | |
| 920 | |
| 921 include(../../../../src/qt_targets.pri) | |
| 922 QMAKE_TARGET_PRODUCT = Designer | |
| 923 diff --git a/tools/designer/src/uitools/uitools.pro b/tools/designer/src/uitools/uitools.pro | |
| 924 index 7b94587..6e0a247 100644 | |
| 925 --- a/tools/designer/src/uitools/uitools.pro | |
| 926 +++ b/tools/designer/src/uitools/uitools.pro | |
| 927 @@ -35,7 +35,7 @@ INSTALLS += quitools_headers | |
| 928 target.path=$$[QT_INSTALL_LIBS] | |
| 929 INSTALLS += target | |
| 930 | |
| 931 -unix { | |
| 932 +unix|win32-g++* { | |
| 933 CONFIG += create_pc | |
| 934 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] | |
| 935 QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET | |
| 936 -- | |
| 937 1.7.4.1 | |
| 938 | |
| 939 | |
| 940 From 1cf4420ae5221d649880cc0d2e1b1895a19ad106 Mon Sep 17 00:00:00 2001 | |
| 941 From: Mark Brand <mabrand@mabrand.nl> | |
| 942 Date: Mon, 10 Jan 2011 20:21:05 +0100 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
943 Subject: [PATCH 06/14] Fix static build on Windows with MinGW. |
| 1608 | 944 |
| 945 Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for | |
| 946 static code. | |
| 947 | |
| 948 Commit edbc656b changed Q_DECL_IMPORT_IMPORT to Q_CORE_EXPORT when | |
| 949 declaring QtCore functions in svg. | |
| 950 | |
| 951 Now we change Q_DECL_IMPORT to Q_GUI_EXPORT when declaring QtGui | |
| 952 functions into opengl and openvg. | |
| 953 | |
| 954 Also removed the redundant keyword "extern" from the function declarations. | |
| 955 | |
| 956 Merge-request: 2540 | |
| 957 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 958 Reviewed-by: mariusSO | |
| 959 (cherry picked from commit 7ec1c27e662dfd4393491f90bfcb9c868cc0a23f) | |
| 960 --- | |
| 961 .../gl2paintengineex/qpaintengineex_opengl2.cpp | 4 ++-- | |
| 962 src/opengl/qglframebufferobject.cpp | 4 ++-- | |
| 963 src/opengl/qglpixelbuffer.cpp | 4 ++-- | |
| 964 src/opengl/qglpixmapfilter.cpp | 6 +++--- | |
| 965 src/opengl/qpaintengine_opengl.cpp | 2 +- | |
| 966 src/opengl/qpixmapdata_gl.cpp | 4 ++-- | |
| 967 src/openvg/qpaintengine_vg.cpp | 8 ++++---- | |
| 968 src/openvg/qpixmapdata_vg.cpp | 4 ++-- | |
| 969 8 files changed, 18 insertions(+), 18 deletions(-) | |
| 970 | |
| 971 diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | |
| 972 index 251fcb9..34f4e75 100644 | |
| 973 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | |
| 974 +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | |
| 975 @@ -102,7 +102,7 @@ extern Q_GUI_EXPORT bool qt_cleartype_enabled; | |
| 976 extern bool qt_applefontsmoothing_enabled; | |
| 977 #endif | |
| 978 | |
| 979 -Q_DECL_IMPORT extern QImage qt_imageForBrush(int brushStyle, bool invert); | |
| 980 +Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert); | |
| 981 | |
| 982 ////////////////////////////////// Private Methods ////////////////////////////////////////// | |
| 983 | |
| 984 @@ -1154,7 +1154,7 @@ void QGL2PaintEngineEx::fill(const QVectorPath &path, const QBrush &brush) | |
| 985 d->fill(path); | |
| 986 } | |
| 987 | |
| 988 -extern Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp | |
| 989 +Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp | |
| 990 | |
| 991 | |
| 992 void QGL2PaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) | |
| 993 diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp | |
| 994 index 6faa645..d57ffc5 100644 | |
| 995 --- a/src/opengl/qglframebufferobject.cpp | |
| 996 +++ b/src/opengl/qglframebufferobject.cpp | |
| 997 @@ -1171,8 +1171,8 @@ void QGLFramebufferObject::drawTexture(const QPointF &point, QMacCompatGLuint te | |
| 998 } | |
| 999 #endif | |
| 1000 | |
| 1001 -Q_DECL_IMPORT extern int qt_defaultDpiX(); | |
| 1002 -Q_DECL_IMPORT extern int qt_defaultDpiY(); | |
| 1003 +Q_GUI_EXPORT int qt_defaultDpiX(); | |
| 1004 +Q_GUI_EXPORT int qt_defaultDpiY(); | |
| 1005 | |
| 1006 /*! \reimp */ | |
| 1007 int QGLFramebufferObject::metric(PaintDeviceMetric metric) const | |
| 1008 diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp | |
| 1009 index 931f701..815afee 100644 | |
| 1010 --- a/src/opengl/qglpixelbuffer.cpp | |
| 1011 +++ b/src/opengl/qglpixelbuffer.cpp | |
| 1012 @@ -416,8 +416,8 @@ QPaintEngine *QGLPixelBuffer::paintEngine() const | |
| 1013 #endif | |
| 1014 } | |
| 1015 | |
| 1016 -Q_DECL_IMPORT extern int qt_defaultDpiX(); | |
| 1017 -Q_DECL_IMPORT extern int qt_defaultDpiY(); | |
| 1018 +Q_GUI_EXPORT int qt_defaultDpiX(); | |
| 1019 +Q_GUI_EXPORT int qt_defaultDpiY(); | |
| 1020 | |
| 1021 /*! \reimp */ | |
| 1022 int QGLPixelBuffer::metric(PaintDeviceMetric metric) const | |
| 1023 diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp | |
| 1024 index 5305e10..eeb791f 100644 | |
| 1025 --- a/src/opengl/qglpixmapfilter.cpp | |
| 1026 +++ b/src/opengl/qglpixmapfilter.cpp | |
| 1027 @@ -63,8 +63,8 @@ | |
| 1028 QT_BEGIN_NAMESPACE | |
| 1029 | |
| 1030 // qpixmapfilter.cpp | |
| 1031 -Q_DECL_IMPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0); | |
| 1032 -Q_DECL_IMPORT QImage qt_halfScaled(const QImage &source); | |
| 1033 +Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0); | |
| 1034 +Q_GUI_EXPORT QImage qt_halfScaled(const QImage &source); | |
| 1035 | |
| 1036 void QGLPixmapFilterBase::bindTexture(const QPixmap &src) const | |
| 1037 { | |
| 1038 @@ -436,7 +436,7 @@ static inline uint nextMultiple(uint x, uint multiplier) | |
| 1039 return x + multiplier - mod; | |
| 1040 } | |
| 1041 | |
| 1042 -Q_DECL_IMPORT void qt_memrotate90_gl(const quint32 *src, int srcWidth, int srcHeight, int srcStride, | |
| 1043 +Q_GUI_EXPORT void qt_memrotate90_gl(const quint32 *src, int srcWidth, int srcHeight, int srcStride, | |
| 1044 quint32 *dest, int dstStride); | |
| 1045 | |
| 1046 bool QGLPixmapBlurFilter::processGL(QPainter *painter, const QPointF &pos, const QPixmap &src, const QRectF &) const | |
| 1047 diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp | |
| 1048 index 0b0f910..c04311d 100644 | |
| 1049 --- a/src/opengl/qpaintengine_opengl.cpp | |
| 1050 +++ b/src/opengl/qpaintengine_opengl.cpp | |
| 1051 @@ -79,7 +79,7 @@ | |
| 1052 | |
| 1053 QT_BEGIN_NAMESPACE | |
| 1054 | |
| 1055 -Q_DECL_IMPORT extern QImage qt_imageForBrush(int brushStyle, bool invert); //in qbrush.cpp | |
| 1056 +Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert); //in qbrush.cpp | |
| 1057 #ifdef QT_MAC_USE_COCOA | |
| 1058 extern void *qt_current_nsopengl_context(); // qgl_mac.mm | |
| 1059 #endif | |
| 1060 diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp | |
| 1061 index 0ac647c..d901ab8 100644 | |
| 1062 --- a/src/opengl/qpixmapdata_gl.cpp | |
| 1063 +++ b/src/opengl/qpixmapdata_gl.cpp | |
| 1064 @@ -739,8 +739,8 @@ QGLTexture* QGLPixmapData::texture() const | |
| 1065 return &m_texture; | |
| 1066 } | |
| 1067 | |
| 1068 -Q_DECL_IMPORT extern int qt_defaultDpiX(); | |
| 1069 -Q_DECL_IMPORT extern int qt_defaultDpiY(); | |
| 1070 +Q_GUI_EXPORT int qt_defaultDpiX(); | |
| 1071 +Q_GUI_EXPORT int qt_defaultDpiY(); | |
| 1072 | |
| 1073 int QGLPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const | |
| 1074 { | |
| 1075 diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp | |
| 1076 index c2a4c9b..d273d33 100644 | |
| 1077 --- a/src/openvg/qpaintengine_vg.cpp | |
| 1078 +++ b/src/openvg/qpaintengine_vg.cpp | |
| 1079 @@ -77,8 +77,8 @@ static const qreal aliasedCoordinateDelta = 0.5 - 0.015625; | |
| 1080 | |
| 1081 #if !defined(QVG_NO_DRAW_GLYPHS) | |
| 1082 | |
| 1083 -Q_DECL_IMPORT extern int qt_defaultDpiX(); | |
| 1084 -Q_DECL_IMPORT extern int qt_defaultDpiY(); | |
| 1085 +Q_GUI_EXPORT int qt_defaultDpiX(); | |
| 1086 +Q_GUI_EXPORT int qt_defaultDpiY(); | |
| 1087 | |
| 1088 class QVGPaintEnginePrivate; | |
| 1089 | |
| 1090 @@ -526,7 +526,7 @@ void QVGPaintEnginePrivate::setTransform | |
| 1091 vgLoadMatrix(mat); | |
| 1092 } | |
| 1093 | |
| 1094 -Q_DECL_IMPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); | |
| 1095 +Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); | |
| 1096 | |
| 1097 void QVGPaintEnginePrivate::updateTransform(QPaintDevice *pdev) | |
| 1098 { | |
| 1099 @@ -994,7 +994,7 @@ VGPath QVGPaintEnginePrivate::roundedRectPath(const QRectF &rect, qreal xRadius, | |
| 1100 return vgpath; | |
| 1101 } | |
| 1102 | |
| 1103 -Q_DECL_IMPORT extern QImage qt_imageForBrush(int style, bool invert); | |
| 1104 +Q_GUI_EXPORT QImage qt_imageForBrush(int style, bool invert); | |
| 1105 | |
| 1106 static QImage colorizeBitmap(const QImage &image, const QColor &color) | |
| 1107 { | |
| 1108 diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp | |
| 1109 index ee5c7d9..cdff46c 100644 | |
| 1110 --- a/src/openvg/qpixmapdata_vg.cpp | |
| 1111 +++ b/src/openvg/qpixmapdata_vg.cpp | |
| 1112 @@ -412,8 +412,8 @@ void QVGPixmapData::reclaimImages() | |
| 1113 destroyImages(); | |
| 1114 } | |
| 1115 | |
| 1116 -Q_DECL_IMPORT extern int qt_defaultDpiX(); | |
| 1117 -Q_DECL_IMPORT extern int qt_defaultDpiY(); | |
| 1118 +Q_GUI_EXPORT int qt_defaultDpiX(); | |
| 1119 +Q_GUI_EXPORT int qt_defaultDpiY(); | |
| 1120 | |
| 1121 int QVGPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const | |
| 1122 { | |
| 1123 -- | |
| 1124 1.7.4.1 | |
| 1125 | |
| 1126 | |
| 1127 From e285e9993d4f2c6823782840d89f44c1bab74afa Mon Sep 17 00:00:00 2001 | |
| 1128 From: Bernhard Rosenkraenzer <br@blankpage.ch> | |
| 1129 Date: Thu, 27 Jan 2011 13:48:13 +0100 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1130 Subject: [PATCH 07/14] Allow the user to select imageformats to be built as plugin vs internal |
| 1608 | 1131 |
| 1132 This adds what is already there for different plugin types to | |
| 1133 imageformats plugins -- allowing the user to configure which | |
| 1134 image formats will be built into Qt and which will be built as | |
| 1135 plugins. | |
| 1136 | |
| 1137 Merge-request: 1028 | |
| 1138 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 1139 (cherry picked from commit a6167267d302b97b94fd350df4b27dc7c9a20ef4) | |
| 1140 --- | |
| 1141 configure | 24 +++++++++++++++++++++++- | |
| 1142 tools/configure/configureapp.cpp | 12 ++++++++++++ | |
| 1143 2 files changed, 35 insertions(+), 1 deletions(-) | |
| 1144 | |
| 1145 diff --git a/configure b/configure | |
| 1146 index c159cd4..207dcc1 100755 | |
| 1147 --- a/configure | |
| 1148 +++ b/configure | |
| 1149 @@ -908,6 +908,16 @@ if [ -d "$relpath/src/plugins/gfxdrivers" ]; then | |
| 1150 CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off | |
| 1151 fi | |
| 1152 | |
| 1153 +CFG_IMAGEFORMAT_PLUGIN_AVAILABLE= | |
| 1154 +if [ -d "$relpath/src/plugins/imageformats" ]; then | |
| 1155 + for a in "$relpath/src/plugins/imageformats/"*; do | |
| 1156 + if [ -d "$a" ]; then | |
| 1157 + base_a=`basename "$a"` | |
| 1158 + CFG_IMAGEFORMAT_PLUGIN_AVAILABLE="${CFG_IMAGEFORMAT_PLUGIN_AVAILABLE} ${base_a}" | |
| 1159 + fi | |
| 1160 + done | |
| 1161 +fi | |
| 1162 + | |
| 1163 #------------------------------------------------------------------------------- | |
| 1164 # parse command line arguments | |
| 1165 #------------------------------------------------------------------------------- | |
| 1166 @@ -2060,7 +2070,7 @@ while [ "$#" -gt 0 ]; do | |
| 1167 UNKNOWN_OPT=yes | |
| 1168 fi | |
| 1169 ;; | |
| 1170 - sql-*|gfx-*|decoration-*|kbd-*|mouse-*) | |
| 1171 + sql-*|gfx-*|decoration-*|kbd-*|mouse-*|imageformat-*) | |
| 1172 # if Qt style options were used, $VAL can be "no", "qt", or "plugin" | |
| 1173 # if autoconf style options were used, $VAL can be "yes" or "no" | |
| 1174 [ "$VAL" = "yes" ] && VAL=qt | |
| 1175 @@ -2102,6 +2112,13 @@ while [ "$#" -gt 0 ]; do | |
| 1176 avail="$CFG_MOUSE_PLUGIN_AVAILABLE" | |
| 1177 fi | |
| 1178 ;; | |
| 1179 + imageformat) | |
| 1180 + avail="$CFG_IMAGEFORMAT_PLUGIN_AVAILABLE" | |
| 1181 + if [ "$OPT" != "plugin" ]; then | |
| 1182 + # png is always built in | |
| 1183 + avail="$avail png" | |
| 1184 + fi | |
| 1185 + ;; | |
| 1186 *) | |
| 1187 avail="" | |
| 1188 echo "BUG: Unhandled type $VAR used in $CURRENT_OPT" | |
| 1189 @@ -2122,6 +2139,11 @@ while [ "$#" -gt 0 ]; do | |
| 1190 # set the CFG_SQL_driver | |
| 1191 eval "CFG_SQL_$VAL=\$OPT" | |
| 1192 continue | |
| 1193 + elif [ "$VAR" = "imageformat" ]; then | |
| 1194 + [ "$OPT" = "qt" ] && OPT=yes | |
| 1195 + VAL="`echo $VAL |tr a-z A-Z`" | |
| 1196 + eval "CFG_$VAL=$OPT" | |
| 1197 + continue | |
| 1198 fi | |
| 1199 | |
| 1200 if [ "$OPT" = "plugin" ] || [ "$OPT" = "qt" ]; then | |
| 1201 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | |
| 1202 index dd5647b..b6e80ea 100644 | |
| 1203 --- a/tools/configure/configureapp.cpp | |
| 1204 +++ b/tools/configure/configureapp.cpp | |
| 1205 @@ -437,6 +437,7 @@ void Configure::parseCmdLine() | |
| 1206 { | |
| 1207 int argCount = configCmdLine.size(); | |
| 1208 int i = 0; | |
| 1209 + const QStringList imageFormats = QStringList() << "gif" << "png" << "mng" << "jpeg" << "tiff"; | |
| 1210 | |
| 1211 #if !defined(EVAL) | |
| 1212 if (argCount < 1) // skip rest if no arguments | |
| 1213 @@ -829,6 +830,17 @@ void Configure::parseCmdLine() | |
| 1214 dictionary[ "SQL_IBASE" ] = "plugin"; | |
| 1215 else if (configCmdLine.at(i) == "-no-sql-ibase") | |
| 1216 dictionary[ "SQL_IBASE" ] = "no"; | |
| 1217 + | |
| 1218 + // Image formats -------------------------------------------- | |
| 1219 + else if (configCmdLine.at(i).startsWith("-qt-imageformat-") && | |
| 1220 + imageFormats.contains(configCmdLine.at(i).section('-', 3))) | |
| 1221 + dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "yes"; | |
| 1222 + else if (configCmdLine.at(i).startsWith("-plugin-imageformat-") && | |
| 1223 + imageFormats.contains(configCmdLine.at(i).section('-', 3))) | |
| 1224 + dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "plugin"; | |
| 1225 + else if (configCmdLine.at(i).startsWith("-no-imageformat-") && | |
| 1226 + imageFormats.contains(configCmdLine.at(i).section('-', 3))) | |
| 1227 + dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "no"; | |
| 1228 #endif | |
| 1229 // IDE project generation ----------------------------------- | |
| 1230 else if (configCmdLine.at(i) == "-no-dsp") | |
| 1231 -- | |
| 1232 1.7.4.1 | |
| 1233 | |
| 1234 | |
| 1235 From 095583fb68a8ae02fd16790eaaa922693d268443 Mon Sep 17 00:00:00 2001 | |
| 1236 From: Mark Brand <mabrand@mabrand.nl> | |
| 1237 Date: Tue, 16 Nov 2010 20:06:28 +0100 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1238 Subject: [PATCH 08/14] explicitly include -llcms for -lmng (mingw-cross-env specific) |
| 1608 | 1239 |
| 1240 --- | |
| 1241 src/gui/image/qmnghandler.pri | 2 +- | |
| 1242 1 files changed, 1 insertions(+), 1 deletions(-) | |
| 1243 | |
| 1244 diff --git a/src/gui/image/qmnghandler.pri b/src/gui/image/qmnghandler.pri | |
| 1245 index ffb98de..c213e09 100644 | |
| 1246 --- a/src/gui/image/qmnghandler.pri | |
| 1247 +++ b/src/gui/image/qmnghandler.pri | |
| 1248 @@ -3,7 +3,7 @@ INCLUDEPATH *= $$PWD | |
| 1249 HEADERS += $$PWD/qmnghandler_p.h | |
| 1250 SOURCES += $$PWD/qmnghandler.cpp | |
| 1251 contains(QT_CONFIG, system-mng) { | |
| 1252 - if(unix|win32-g++*):LIBS += -lmng | |
| 1253 + if(unix|win32-g++*):LIBS += -lmng -llcms | |
| 1254 else:win32: LIBS += libmng.lib | |
| 1255 } else { | |
| 1256 include($$PWD/../../3rdparty/libmng.pri) | |
| 1257 -- | |
| 1258 1.7.4.1 | |
| 1259 | |
| 1260 | |
| 1261 From 3baf871e135d70edbc2431038708886d2795b8b3 Mon Sep 17 00:00:00 2001 | |
| 1262 From: Mark Brand <mabrand@mabrand.nl> | |
| 1263 Date: Sat, 5 Jun 2010 23:41:04 +0200 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1264 Subject: [PATCH 09/14] added missing INSTALLS to JavaScriptCore.pro for static libjscore (mingw-cross-env specific) |
| 1608 | 1265 |
| 1266 For static build of Qt on win32-g++*, applications using webkit | |
| 1267 link to libjscore.a. | |
| 1268 --- | |
| 1269 .../webkit/JavaScriptCore/JavaScriptCore.pro | 6 ++++++ | |
| 1270 1 files changed, 6 insertions(+), 0 deletions(-) | |
| 1271 | |
| 1272 diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | |
| 1273 index a805170..027eb0f 100644 | |
| 1274 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | |
| 1275 +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | |
| 1276 @@ -14,6 +14,12 @@ QT -= gui | |
| 1277 | |
| 1278 CONFIG += depend_includepath | |
| 1279 | |
| 1280 +static:win32-g++* { | |
| 1281 + # applications must link to static libjscore | |
| 1282 + target.path = $$[QT_INSTALL_LIBS] | |
| 1283 + INSTALLS += target | |
| 1284 +} | |
| 1285 + | |
| 1286 contains(QT_CONFIG, embedded):CONFIG += embedded | |
| 1287 | |
| 1288 CONFIG(QTDIR_build) { | |
| 1289 -- | |
| 1290 1.7.4.1 | |
| 1291 | |
| 1292 | |
| 1293 From 9e5d4702daa1168ab14ba936014dd6a7bb5671c9 Mon Sep 17 00:00:00 2001 | |
| 1294 From: Mark Brand <mabrand@mabrand.nl> | |
| 1295 Date: Tue, 9 Nov 2010 20:09:45 +0100 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1296 Subject: [PATCH 10/14] Partially restored support for static linking of QtWebKit (mingw-cross-env specific) |
| 1608 | 1297 |
| 1298 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113. | |
| 1299 Static QtWebkit might be supported by mingw-cross-env. | |
| 1300 --- | |
| 1301 configure | 6 ------ | |
| 1302 1 files changed, 0 insertions(+), 6 deletions(-) | |
| 1303 | |
| 1304 diff --git a/configure b/configure | |
| 1305 index 207dcc1..b10b0a2 100755 | |
| 1306 --- a/configure | |
| 1307 +++ b/configure | |
| 1308 @@ -7179,12 +7179,6 @@ if [ "$CFG_GUI" = "no" ]; then | |
| 1309 canBuildWebKit="no" | |
| 1310 fi | |
| 1311 | |
| 1312 -if [ "$CFG_SHARED" = "no" ]; then | |
| 1313 - echo | |
| 1314 - echo "WARNING: Using static linking will disable the WebKit module." | |
| 1315 - echo | |
| 1316 - canBuildWebKit="no" | |
| 1317 -fi | |
| 1318 | |
| 1319 CFG_CONCURRENT="yes" | |
| 1320 if [ "$canBuildQtConcurrent" = "no" ]; then | |
| 1321 -- | |
| 1322 1.7.4.1 | |
| 1323 | |
| 1324 | |
| 1325 From 61064254a0c5c2c3785909acf60cabdbdcb18d5b Mon Sep 17 00:00:00 2001 | |
| 1326 From: Mark Brand <mabrand@mabrand.nl> | |
| 1327 Date: Thu, 6 Jan 2011 14:21:32 +0100 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1328 Subject: [PATCH 11/14] pkg-config file for jscore (mingw-cross-env specific) |
| 1608 | 1329 |
| 1330 --- | |
| 1331 .../webkit/JavaScriptCore/JavaScriptCore.pro | 8 ++++++++ | |
| 1332 1 files changed, 8 insertions(+), 0 deletions(-) | |
| 1333 | |
| 1334 diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | |
| 1335 index 027eb0f..44bbc3f 100644 | |
| 1336 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | |
| 1337 +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | |
| 1338 @@ -236,3 +236,11 @@ SOURCES += \ | |
| 1339 | |
| 1340 # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec | |
| 1341 *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x | |
| 1342 + | |
| 1343 +win32-g++-* { | |
| 1344 + CONFIG += create_pc | |
| 1345 + QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] | |
| 1346 + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET | |
| 1347 + QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS] | |
| 1348 + QMAKE_PKGCONFIG_DESTDIR = pkgconfig | |
| 1349 +} | |
| 1350 -- | |
| 1351 1.7.4.1 | |
| 1352 | |
| 1353 | |
| 1354 From 0ad5aac2fdc0f2e81f94c92867bb4e15b3da3ddf Mon Sep 17 00:00:00 2001 | |
| 1355 From: Tony Theodore <tonyt@logyst.com> | |
| 1356 Date: Mon, 21 Feb 2011 22:22:04 +0100 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1357 Subject: [PATCH 12/14] workaround for native build on OSX (mingw-cross-env specific) |
| 1608 | 1358 |
| 1359 The native build complains about: | |
| 1360 "You are building a 64-bit application, but using a 32-bit version of | |
| 1361 Qt. Check your build configuration." | |
| 1362 --- | |
| 1363 mkspecs/macx-g++/qmake.conf | 4 ++-- | |
| 1364 1 files changed, 2 insertions(+), 2 deletions(-) | |
| 1365 | |
| 1366 diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf | |
| 1367 index 4464686..ba0c45b 100644 | |
| 1368 --- a/mkspecs/macx-g++/qmake.conf | |
| 1369 +++ b/mkspecs/macx-g++/qmake.conf | |
| 1370 @@ -13,8 +13,8 @@ CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib | |
| 1371 QT += core gui | |
| 1372 QMAKE_INCREMENTAL_STYLE = sublib | |
| 1373 | |
| 1374 -QMAKE_CC = gcc | |
| 1375 -QMAKE_CXX = g++ | |
| 1376 +QMAKE_CC = gcc -arch i386 | |
| 1377 +QMAKE_CXX = g++ -arch i386 | |
| 1378 | |
| 1379 include(../common/mac-g++.conf) | |
| 1380 | |
| 1381 -- | |
| 1382 1.7.4.1 | |
| 1383 | |
|
1711
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1384 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1385 From db85d5c4df98ee12261f62fa637e629b120680a6 Mon Sep 17 00:00:00 2001 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1386 From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1387 Date: Mon, 10 Jan 2011 20:09:24 +0100 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1388 Subject: [PATCH 13/14] fix -enable-stdcall-fixup usage |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1389 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1390 the leading "-Wl," was apparently accidentally split off to the wrong |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1391 line. |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1392 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1393 Task-number: QTBUG-15391 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1394 Reviewed-by: mariusSO |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1395 (cherry picked from commit 0953ee31dba532603fb7dfbde78c99aafb048bef) |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1396 --- |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1397 mkspecs/win32-g++/qmake.conf | 4 ++-- |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1398 1 files changed, 2 insertions(+), 2 deletions(-) |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1399 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1400 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1401 index ec216aa..2d9833b 100644 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1402 --- a/mkspecs/win32-g++/qmake.conf |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1403 +++ b/mkspecs/win32-g++/qmake.conf |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1404 @@ -52,8 +52,8 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1405 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1406 QMAKE_LINK = g++ |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1407 QMAKE_LINK_C = gcc |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1408 -QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1409 -QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1410 +QMAKE_LFLAGS = -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1411 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1412 QMAKE_LFLAGS_EXCEPTIONS_OFF = |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1413 QMAKE_LFLAGS_RELEASE = -Wl,-s |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1414 QMAKE_LFLAGS_DEBUG = |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1415 -- |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1416 1.7.4.1 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1417 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1418 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1419 From ed4c5f0a04a90da94c1b9ea9cd504b7ad1e14ae1 Mon Sep 17 00:00:00 2001 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1420 From: Mark Brand <mabrand@mabrand.nl> |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1421 Date: Sun, 27 Mar 2011 20:55:48 +0200 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1422 Subject: [PATCH 14/14] fix -enable-stdcall-fixup usage |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1423 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1424 the leading "-Wl," was apparently accidentally split off to the wrong |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1425 line. |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1426 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1427 Originally done in 0953ee3 for mkspecs/win32-g++. |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1428 --- |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1429 mkspecs/unsupported/win32-g++-cross/qmake.conf | 4 ++-- |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1430 1 files changed, 2 insertions(+), 2 deletions(-) |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1431 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1432 diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1433 index 7e077a1..efc3de2 100644 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1434 --- a/mkspecs/unsupported/win32-g++-cross/qmake.conf |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1435 +++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1436 @@ -52,8 +52,8 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1437 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1438 QMAKE_LINK = i686-pc-mingw32-g++ |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1439 QMAKE_LINK_C = i686-pc-mingw32-gcc |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1440 -QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1441 -QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1442 +QMAKE_LFLAGS = -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1443 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1444 QMAKE_LFLAGS_EXCEPTIONS_OFF = |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1445 QMAKE_LFLAGS_RELEASE = -Wl,-s |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1446 QMAKE_LFLAGS_DEBUG = |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1447 -- |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1448 1.7.4.1 |
|
39f91df0fd34
package qt: fixed -enable-stdcall-fixup
Mark Brand <mabrand@mabrand.nl>
parents:
1608
diff
changeset
|
1449 |