Changeset 190 for trunk/src/corelib/io/qprocess_os2.cpp
- Timestamp:
- Sep 22, 2009, 10:44:03 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/corelib/io/qprocess_os2.cpp
r181 r190 51 51 #include <ctype.h> 52 52 53 54 53 55 /* 54 56 Returns a human readable representation of the first \a len … … 122 124 ::fcntl(pipe[0], F_SETFD, FD_CLOEXEC); 123 125 ::fcntl(pipe[1], F_SETFD, FD_CLOEXEC); 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 124 359 } 125 360 … … 372 607 return; 373 608 609 610 374 611 // Start the process (platform dependent) 375 612 q->setProcessState(QProcess::Starting); … … 424 661 .arg(qPrintable(qt_error_string(errno)))); 425 662 emit q->error(processError); 663 426 664 cleanup(); 427 665 return; … … 452 690 ::fcntl(stderrChannel.pipe[0], F_SETFL, ::fcntl(stderrChannel.pipe[0], F_GETFL) | O_NONBLOCK); 453 691 454 q->setProcessState(QProcess::Running);455 // User can call kill()/terminate() from the stateChanged() slot456 // so check before proceeding457 if (!pid)458 return;459 460 692 // give the process a chance to start ... 461 693 DosSleep(100); 694 462 695 _q_startupNotification(); 463 696 } … … 465 698 bool QProcessPrivate::processStarted() 466 699 { 467 return processState == QProcess::Running; 700 // we don't actually wait for any notification from the child process 701 // assuming it has been started as long as spawnvpe() returns success 702 return processState == QProcess::Starting; 468 703 } 469 704 … … 589 824 Q_Q(QProcess); 590 825 591 if (processSta rted())826 if (processSta) 592 827 return true; 593 828 … … 820 1055 void QProcessPrivate::findExitCode() 821 1056 { 1057 1058 1059 1060 1061 1062 1063 1064 822 1065 } 823 1066 … … 838 1081 #if defined QPROCESS_DEBUG 839 1082 qDebug() << "QProcessPrivate::waitForDeadChild() not dead!"; 1083 1084 840 1085 #endif 841 1086 return false;
Note:
See TracChangeset
for help on using the changeset viewer.